From 85a4b102d7c83d37e3c028f52d8f24376baa5465 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Wed, 11 Oct 2023 15:17:21 +0100 Subject: [PATCH 1/4] Update complement.sh to match new public API shape Sister PR to https://github.com/matrix-org/complement/pull/666 Context: https://github.com/matrix-org/complement/issues/654#issuecomment-1746613495 --- scripts-dev/complement.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts-dev/complement.sh b/scripts-dev/complement.sh index 8416b5567437..3e0cddb527da 100755 --- a/scripts-dev/complement.sh +++ b/scripts-dev/complement.sh @@ -214,7 +214,7 @@ fi extra_test_args=() -test_tags="synapse_blacklist,msc3874,msc3890,msc3391,msc3930,faster_joins" +test_packages="./tests/csapi ./tests ./tests/msc3874 ./tests/msc3890 ./tests/msc3391 ./tests/msc3930 ./tests/msc3902" # All environment variables starting with PASS_ will be shared. # (The prefix is stripped off before reaching the container.) @@ -277,4 +277,4 @@ export PASS_SYNAPSE_LOG_TESTING=1 echo "Images built; running complement" cd "$COMPLEMENT_DIR" -go test -v -tags $test_tags -count=1 "${extra_test_args[@]}" "$@" ./tests/... +go test -v -tags "synapse_blacklist" -count=1 "${extra_test_args[@]}" "$@" $test_packages From 6c3686584835654433ec3c7ffada660c50b02082 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Wed, 11 Oct 2023 15:26:03 +0100 Subject: [PATCH 2/4] Changelog --- changelog.d/16466.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/16466.misc diff --git a/changelog.d/16466.misc b/changelog.d/16466.misc new file mode 100644 index 000000000000..be5001fd198b --- /dev/null +++ b/changelog.d/16466.misc @@ -0,0 +1 @@ +Update complement.sh to match new public API shape From 2620995e4e42f634ba0d1febc4146a6784043e96 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Wed, 11 Oct 2023 15:30:01 +0100 Subject: [PATCH 3/4] Pedantry --- changelog.d/16466.misc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.d/16466.misc b/changelog.d/16466.misc index be5001fd198b..471056bb0fbd 100644 --- a/changelog.d/16466.misc +++ b/changelog.d/16466.misc @@ -1 +1 @@ -Update complement.sh to match new public API shape +Update complement.sh to match new public API shape. From 8d80b6bb7351e53f7ad0ac84ccfa3e9642a98fa7 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Wed, 11 Oct 2023 15:56:51 +0100 Subject: [PATCH 4/4] Run complement plz --- .github/workflows/tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7dbd83908e8f..fcbd40b74625 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -56,6 +56,7 @@ jobs: - 'pyproject.toml' - 'poetry.lock' - 'docker/**' + - 'scripts-dev/complement.sh' linting: - 'synapse/**'