Skip to content

Commit 20a4dc9

Browse files
reivilibreazmeuk
authored andcommitted
Re-enable running Complement tests against Synapse with workers. (matrix-org#13420)
1 parent 176693d commit 20a4dc9

File tree

2 files changed

+4
-24
lines changed

2 files changed

+4
-24
lines changed

.github/workflows/tests.yml

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -328,29 +328,8 @@ jobs:
328328
- arrangement: monolith
329329
database: Postgres
330330

331-
steps:
332-
- name: Run actions/checkout@v2 for synapse
333-
uses: actions/checkout@v2
334-
with:
335-
path: synapse
336-
337-
- name: Prepare Complement's Prerequisites
338-
run: synapse/.ci/scripts/setup_complement_prerequisites.sh
339-
340-
- run: |
341-
set -o pipefail
342-
POSTGRES=${{ (matrix.database == 'Postgres') && 1 || '' }} WORKERS=${{ (matrix.arrangement == 'workers') && 1 || '' }} COMPLEMENT_DIR=`pwd`/complement synapse/scripts-dev/complement.sh -json 2>&1 | gotestfmt
343-
shell: bash
344-
name: Run Complement Tests
345-
346-
# XXX When complement with workers is stable, move this back into the standard
347-
# "complement" matrix above.
348-
#
349-
# See https://github.com/matrix-org/synapse/issues/13161
350-
complement-workers:
351-
if: "${{ !failure() && !cancelled() }}"
352-
needs: linting-done
353-
runs-on: ubuntu-latest
331+
- arrangement: workers
332+
database: Postgres
354333

355334
steps:
356335
- name: Run actions/checkout@v2 for synapse
@@ -363,7 +342,7 @@ jobs:
363342

364343
- run: |
365344
set -o pipefail
366-
POSTGRES=1 WORKERS=1 COMPLEMENT_DIR=`pwd`/complement synapse/scripts-dev/complement.sh -json 2>&1 | gotestfmt
345+
POSTGRES=${{ (matrix.database == 'Postgres') && 1 || '' }} WORKERS=${{ (matrix.arrangement == 'workers') && 1 || '' }} COMPLEMENT_DIR=`pwd`/complement synapse/scripts-dev/complement.sh -json 2>&1 | gotestfmt
367346
shell: bash
368347
name: Run Complement Tests
369348

changelog.d/13420.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Re-enable running Complement tests against Synapse with workers.

0 commit comments

Comments
 (0)