diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4c27821..077d962 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -115,7 +115,6 @@ jobs: name: Bandit Security Report path: report.json - tests: name: Python ${{ matrix.python-version }} / ${{ matrix.db }} / Django ${{ matrix.django-version}} runs-on: ubuntu-latest @@ -123,7 +122,7 @@ jobs: strategy: max-parallel: 4 matrix: - db: [ sqlite, mysql ] + db: [ sqlite, mariadb ] django-version: ["~=4.2.0" ] python-version: [ "3.10" ] @@ -131,20 +130,21 @@ jobs: mariadb: image: mariadb:latest env: - MYSQL_ROOT_PASSWORD: password + MARIADB_ROOT_PASSWORD: password ports: - 3306:3306 options: >- - --health-cmd="mysqladmin ping" + --health-cmd="mariadb-admin ping" --health-interval=10s --health-timeout=5s --health-retries=3 steps: - name: Verify MySQL connection from host - if: matrix.db == 'mysql' + if: matrix.db == 'mariadb' run: | mysql --host 127.0.0.1 --port 3306 -uroot -ppassword -e "SHOW DATABASES" 2>&1 > /dev/null + mysql --host 127.0.0.1 --port 3306 -uroot -ppassword -V - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} @@ -204,6 +204,7 @@ jobs: - name: Combine Report Coverage run: | coverage combine coverage-*/.coverage + coverage report --precision=1 --sort=cover --skip-covered --skip-empty coverage xml - name: Upload coverage to Codecov