diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eeb5ad591..07762640b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,25 +11,24 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ['3.8', '3.12'] + python-version: ['py38', 'py312'] django-version: [django42] steps: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 with: - python-version: ${{ matrix.python-version }} architecture: x64 + if: ${{ matrix.python-version == 'py38' }} + python-version: '3.8' + elsif: ${{ matrix.python-version == 'py312' }} + python-version: '3.12' - name: Start container run: | docker-compose -f .github/docker-compose-github.yml up -d - name: Install test dependencies and run validation run: | - if [[ "${{ matrix.python-version }}" == "3.8" ]]; then - docker exec -e TOXENV=py38-${{ matrix.django-version }} -u root enterprise.catalog.app /edx/app/enterprise_catalog/enterprise_catalog/validate.sh - elif [[ "${{ matrix.python-version }}" == "3.12" ]]; then - docker exec -e TOXENV=py312-${{ matrix.django-version }} -u root enterprise.catalog.app /edx/app/enterprise_catalog/enterprise_catalog/validate.sh - fi + docker exec -e TOXENV=${{ matrix.python-version }}-${{ matrix.django-version }} -u root enterprise.catalog.app /edx/app/enterprise_catalog/enterprise_catalog/validate.sh - name: Code Coverage if: matrix.python-version == '3.8' && matrix.django-version=='django42' uses: codecov/codecov-action@v1 diff --git a/.github/workflows/mysql-migrations-check.yml b/.github/workflows/mysql-migrations-check.yml index 4782dcdb7..1692af970 100644 --- a/.github/workflows/mysql-migrations-check.yml +++ b/.github/workflows/mysql-migrations-check.yml @@ -53,7 +53,7 @@ jobs: pip uninstall -y mysqlclient pip install --no-binary mysqlclient mysqlclient pip uninstall -y xmlsec - pip install --no-binary xmlsec==1.3.13 + pip install --no-binary xmlsec xmlsec==1.3.13 - name: Initiate services run: | sudo /etc/init.d/mysql start