From 0b2517255b9b07e9ade3a055b21173668cf58de9 Mon Sep 17 00:00:00 2001 From: Patrick Cloke Date: Wed, 13 Jul 2022 07:54:36 -0400 Subject: [PATCH 1/3] Do not fail build if complement with workers fails. --- .github/workflows/tests.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 4bc29c820759..538f338cf312 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -346,6 +346,30 @@ jobs: 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 + + 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=1 WORKERS=1 COMPLEMENT_DIR=`pwd`/complement synapse/scripts-dev/complement.sh -json 2>&1 | gotestfmt + shell: bash + name: Run Complement Tests + # a job which marks all the other jobs as complete, thus allowing PRs to be merged. tests-done: if: ${{ always() }} From 7793bd24188157b2f4e3f33222a8c75db8bcd5a9 Mon Sep 17 00:00:00 2001 From: Patrick Cloke Date: Wed, 13 Jul 2022 07:55:31 -0400 Subject: [PATCH 2/3] Newsfragment --- changelog.d/13266.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/13266.misc diff --git a/changelog.d/13266.misc b/changelog.d/13266.misc new file mode 100644 index 000000000000..d583acb81b3b --- /dev/null +++ b/changelog.d/13266.misc @@ -0,0 +1 @@ +Do not fail build if complement with workers fails. From aa7b5fbe4e7443680a12f2a979c1142c057aa193 Mon Sep 17 00:00:00 2001 From: Patrick Cloke Date: Wed, 13 Jul 2022 07:56:15 -0400 Subject: [PATCH 3/3] Remove complement + workers from the complement matrix. --- .github/workflows/tests.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 538f338cf312..c8b033e8a473 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -328,9 +328,6 @@ jobs: - arrangement: monolith database: Postgres - - arrangement: workers - database: Postgres - steps: - name: Run actions/checkout@v2 for synapse uses: actions/checkout@v2