From 4e3e5bb847c1022f90681b56583b801af0623322 Mon Sep 17 00:00:00 2001 From: Eric Eastwood Date: Thu, 5 Mar 2026 10:58:15 -0600 Subject: [PATCH 1/8] Try out CI for #19476 --- .github/workflows/tests.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 98b47130a1c..785f3853ab0 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -713,6 +713,30 @@ jobs: cache-dependency-path: complement/go.sum go-version-file: complement/go.mod + # Run the image sanity check test first as this is the first thing we want to know + # about (are we actually testing what we expect?) and we don't want to debug + # downstream failures (wild goose chase). + - name: Sanity check Complement image + id: run_sanity_check_complement_image_test + # -p=1: We're using `-p 1` to force the test packages to run serially as GHA boxes + # are underpowered and don't like running tons of Synapse instances at once. + # -json: Output JSON format so that gotestfmt can parse it. + # + # tee /tmp/gotest-complement.log: We tee the output to a file so that we can re-process it + # later on for better formatting with gotestfmt. But we still want the command + # to output to the terminal as it runs so we can see what's happening in + # real-time. + run: | + set -o pipefail + COMPLEMENT_DIR=`pwd`/complement synapse/scripts-dev/complement.sh -p 1 -json -run 'TestSynapseVersion/Synapse_version_matches_current_git_checkout' 2>&1 | tee /tmp/gotest-complement.log + shell: bash + env: + POSTGRES: ${{ (matrix.database == 'Postgres') && 1 || '' }} + WORKERS: ${{ (matrix.arrangement == 'workers') && 1 || '' }} + # We don't run `gotestfmt` for the sanity check step as it's only one test so + # there is nothing to organize. And the extra step is more noise to click + # through and grok. If this step fails, it will be obvious still. + - name: Run Complement Tests id: run_complement_tests # -p=1: We're using `-p 1` to force the test packages to run serially as GHA boxes From e5754997da706c1d185394e7520dd9c5d64b5f9d Mon Sep 17 00:00:00 2001 From: Eric Eastwood Date: Thu, 5 Mar 2026 10:59:39 -0600 Subject: [PATCH 2/8] Add changelog --- changelog.d/19532.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/19532.misc diff --git a/changelog.d/19532.misc b/changelog.d/19532.misc new file mode 100644 index 00000000000..2c88a884405 --- /dev/null +++ b/changelog.d/19532.misc @@ -0,0 +1 @@ +a. From 3f955258662089440da9c045950d68963011092c Mon Sep 17 00:00:00 2001 From: Eric Eastwood Date: Thu, 5 Mar 2026 11:13:34 -0600 Subject: [PATCH 3/8] Try removing comments --- .github/workflows/tests.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 785f3853ab0..48d9893b02e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -733,9 +733,6 @@ jobs: env: POSTGRES: ${{ (matrix.database == 'Postgres') && 1 || '' }} WORKERS: ${{ (matrix.arrangement == 'workers') && 1 || '' }} - # We don't run `gotestfmt` for the sanity check step as it's only one test so - # there is nothing to organize. And the extra step is more noise to click - # through and grok. If this step fails, it will be obvious still. - name: Run Complement Tests id: run_complement_tests From f6d7a9a179e33b301ef1a16bc447196416b03b9d Mon Sep 17 00:00:00 2001 From: Eric Eastwood Date: Thu, 5 Mar 2026 11:14:15 -0600 Subject: [PATCH 4/8] Try removing unused id --- .github/workflows/tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 48d9893b02e..715bd7cefdb 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -717,7 +717,6 @@ jobs: # about (are we actually testing what we expect?) and we don't want to debug # downstream failures (wild goose chase). - name: Sanity check Complement image - id: run_sanity_check_complement_image_test # -p=1: We're using `-p 1` to force the test packages to run serially as GHA boxes # are underpowered and don't like running tons of Synapse instances at once. # -json: Output JSON format so that gotestfmt can parse it. From d495c369cc0ab33bdc2dd64a43d40d4c6ca93e9f Mon Sep 17 00:00:00 2001 From: Eric Eastwood Date: Thu, 5 Mar 2026 11:14:43 -0600 Subject: [PATCH 5/8] Try removing `-run '...'` --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 715bd7cefdb..95df62543b5 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -727,7 +727,7 @@ jobs: # real-time. run: | set -o pipefail - COMPLEMENT_DIR=`pwd`/complement synapse/scripts-dev/complement.sh -p 1 -json -run 'TestSynapseVersion/Synapse_version_matches_current_git_checkout' 2>&1 | tee /tmp/gotest-complement.log + COMPLEMENT_DIR=`pwd`/complement synapse/scripts-dev/complement.sh -p 1 -json 2>&1 | tee /tmp/gotest-complement.log shell: bash env: POSTGRES: ${{ (matrix.database == 'Postgres') && 1 || '' }} From dbcbe414007f8203bd7d26bfe86ec92cac779177 Mon Sep 17 00:00:00 2001 From: Eric Eastwood Date: Thu, 5 Mar 2026 11:15:57 -0600 Subject: [PATCH 6/8] Try removing new step --- .github/workflows/tests.yml | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 95df62543b5..98b47130a1c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -713,26 +713,6 @@ jobs: cache-dependency-path: complement/go.sum go-version-file: complement/go.mod - # Run the image sanity check test first as this is the first thing we want to know - # about (are we actually testing what we expect?) and we don't want to debug - # downstream failures (wild goose chase). - - name: Sanity check Complement image - # -p=1: We're using `-p 1` to force the test packages to run serially as GHA boxes - # are underpowered and don't like running tons of Synapse instances at once. - # -json: Output JSON format so that gotestfmt can parse it. - # - # tee /tmp/gotest-complement.log: We tee the output to a file so that we can re-process it - # later on for better formatting with gotestfmt. But we still want the command - # to output to the terminal as it runs so we can see what's happening in - # real-time. - run: | - set -o pipefail - COMPLEMENT_DIR=`pwd`/complement synapse/scripts-dev/complement.sh -p 1 -json 2>&1 | tee /tmp/gotest-complement.log - shell: bash - env: - POSTGRES: ${{ (matrix.database == 'Postgres') && 1 || '' }} - WORKERS: ${{ (matrix.arrangement == 'workers') && 1 || '' }} - - name: Run Complement Tests id: run_complement_tests # -p=1: We're using `-p 1` to force the test packages to run serially as GHA boxes From f98d36ebba0853adf57cfd61558dceba65539dfb Mon Sep 17 00:00:00 2001 From: Eric Eastwood Date: Thu, 5 Mar 2026 11:17:43 -0600 Subject: [PATCH 7/8] Python change --- synapse/util/__init__.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/synapse/util/__init__.py b/synapse/util/__init__.py index fbd01914d56..8a3e7a95cd0 100644 --- a/synapse/util/__init__.py +++ b/synapse/util/__init__.py @@ -77,6 +77,9 @@ def log_failure( # Version string with git info. Computed here once so that we don't invoke git multiple # times. SYNAPSE_VERSION = get_distribution_version_string("matrix-synapse", __file__) +""" +Version string with git info. +""" class ExceptionBundle(Exception): From c7e6cf44843c2117eecea82e50004d4173b30302 Mon Sep 17 00:00:00 2001 From: Eric Eastwood Date: Thu, 5 Mar 2026 12:01:42 -0600 Subject: [PATCH 8/8] Try new CI again --- .github/workflows/tests.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 98b47130a1c..785f3853ab0 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -713,6 +713,30 @@ jobs: cache-dependency-path: complement/go.sum go-version-file: complement/go.mod + # Run the image sanity check test first as this is the first thing we want to know + # about (are we actually testing what we expect?) and we don't want to debug + # downstream failures (wild goose chase). + - name: Sanity check Complement image + id: run_sanity_check_complement_image_test + # -p=1: We're using `-p 1` to force the test packages to run serially as GHA boxes + # are underpowered and don't like running tons of Synapse instances at once. + # -json: Output JSON format so that gotestfmt can parse it. + # + # tee /tmp/gotest-complement.log: We tee the output to a file so that we can re-process it + # later on for better formatting with gotestfmt. But we still want the command + # to output to the terminal as it runs so we can see what's happening in + # real-time. + run: | + set -o pipefail + COMPLEMENT_DIR=`pwd`/complement synapse/scripts-dev/complement.sh -p 1 -json -run 'TestSynapseVersion/Synapse_version_matches_current_git_checkout' 2>&1 | tee /tmp/gotest-complement.log + shell: bash + env: + POSTGRES: ${{ (matrix.database == 'Postgres') && 1 || '' }} + WORKERS: ${{ (matrix.arrangement == 'workers') && 1 || '' }} + # We don't run `gotestfmt` for the sanity check step as it's only one test so + # there is nothing to organize. And the extra step is more noise to click + # through and grok. If this step fails, it will be obvious still. + - name: Run Complement Tests id: run_complement_tests # -p=1: We're using `-p 1` to force the test packages to run serially as GHA boxes