tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Fix CI to run the unit tests without optional deps (#11017)

Browse source 
This also turns off calculating code coverage, as we didn't use it and it was a lot of noise
This commit is contained in:
Erik Johnston 2021-10-08 10:05:48 +01:00 committed by GitHub
parent e79ee48313
commit 0b4d5ce5e3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
.github/workflows/tests.yml vendored
View file

@ -78,20 +78,23 @@ jobs:
matrix: matrix:
python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"] python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
database: ["sqlite"] database: ["sqlite"]
toxenv: ["py"]
include: include:
# Newest Python without optional deps # Newest Python without optional deps
- python-version: "3.10" - python-version: "3.10"
toxenv: "py-noextras,combine" toxenv: "py-noextras"
# Oldest Python with PostgreSQL # Oldest Python with PostgreSQL
- python-version: "3.6" - python-version: "3.6"
database: "postgres" database: "postgres"
postgres-version: "9.6" postgres-version: "9.6"
toxenv: "py"
# Newest Python with newest PostgreSQL # Newest Python with newest PostgreSQL
- python-version: "3.10" - python-version: "3.10"
database: "postgres" database: "postgres"
postgres-version: "14" postgres-version: "14"
toxenv: "py"
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
@ -111,7 +114,7 @@ jobs:
if: ${{ matrix.postgres-version }} if: ${{ matrix.postgres-version }}
timeout-minutes: 2 timeout-minutes: 2
run: until pg_isready -h localhost; do sleep 1; done run: until pg_isready -h localhost; do sleep 1; done
- run: tox -e py,combine - run: tox -e ${{ matrix.toxenv }}
env: env:
TRIAL_FLAGS: "--jobs=2" TRIAL_FLAGS: "--jobs=2"
SYNAPSE_POSTGRES: ${{ matrix.database == 'postgres' || '' }} SYNAPSE_POSTGRES: ${{ matrix.database == 'postgres' || '' }}
@ -169,7 +172,7 @@ jobs:
with: with:
python-version: ${{ matrix.python-version }} python-version: ${{ matrix.python-version }}
- run: pip install tox - run: pip install tox
- run: tox -e py,combine - run: tox -e py
env: env:
TRIAL_FLAGS: "--jobs=2" TRIAL_FLAGS: "--jobs=2"
- name: Dump logs - name: Dump logs

1
changelog.d/11017.misc Normal file
View file

@ -0,0 +1 @@
Fix CI to run the unit tests without optional deps.