diff options
| -rw-r--r-- | .github/workflows/tests.yml | 27 | ||||
| -rw-r--r-- | changelog.d/13420.misc | 1 |
2 files changed, 4 insertions, 24 deletions
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c8b033e8a4..4bc29c8207 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -328,29 +328,8 @@ jobs: - arrangement: monolith database: Postgres - steps: - - name: Run actions/checkout@v2 for synapse - uses: actions/checkout@v2 - with: - path: synapse - - - name: Prepare Complement's Prerequisites - run: synapse/.ci/scripts/setup_complement_prerequisites.sh - - - run: | - set -o pipefail - POSTGRES=${{ (matrix.database == 'Postgres') && 1 || '' }} WORKERS=${{ (matrix.arrangement == 'workers') && 1 || '' }} COMPLEMENT_DIR=`pwd`/complement synapse/scripts-dev/complement.sh -json 2>&1 | gotestfmt - shell: bash - name: Run Complement Tests - - # XXX When complement with workers is stable, move this back into the standard - # "complement" matrix above. - # - # See https://github.com/matrix-org/synapse/issues/13161 - complement-workers: - if: "${{ !failure() && !cancelled() }}" - needs: linting-done - runs-on: ubuntu-latest + - arrangement: workers + database: Postgres steps: - name: Run actions/checkout@v2 for synapse @@ -363,7 +342,7 @@ jobs: - run: | set -o pipefail - POSTGRES=1 WORKERS=1 COMPLEMENT_DIR=`pwd`/complement synapse/scripts-dev/complement.sh -json 2>&1 | gotestfmt + POSTGRES=${{ (matrix.database == 'Postgres') && 1 || '' }} WORKERS=${{ (matrix.arrangement == 'workers') && 1 || '' }} COMPLEMENT_DIR=`pwd`/complement synapse/scripts-dev/complement.sh -json 2>&1 | gotestfmt shell: bash name: Run Complement Tests diff --git a/changelog.d/13420.misc b/changelog.d/13420.misc new file mode 100644 index 0000000000..ff1a68e2e8 --- /dev/null +++ b/changelog.d/13420.misc @@ -0,0 +1 @@ +Re-enable running Complement tests against Synapse with workers. \ No newline at end of file |