From 07232e27a892962627071f40d8ce7a38e5bf2553 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Date: Tue, 30 Apr 2024 13:57:20 +0100
Subject: Enable complement tests for MSC4115 support (#17137)

Follow-up to #17137 and
https://github.com/matrix-org/complement/pull/722
---
 scripts-dev/complement.sh | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'scripts-dev')

diff --git a/scripts-dev/complement.sh b/scripts-dev/complement.sh
index 2a779f8255..b306b80749 100755
--- a/scripts-dev/complement.sh
+++ b/scripts-dev/complement.sh
@@ -214,7 +214,17 @@ fi
 
 extra_test_args=()
 
-test_packages="./tests/csapi ./tests ./tests/msc3874 ./tests/msc3890 ./tests/msc3391 ./tests/msc3930 ./tests/msc3902 ./tests/msc3967"
+test_packages=(
+    ./tests/csapi
+    ./tests
+    ./tests/msc3874
+    ./tests/msc3890
+    ./tests/msc3391
+    ./tests/msc3930
+    ./tests/msc3902
+    ./tests/msc3967
+    ./tests/msc4115
+)
 
 # Enable dirty runs, so tests will reuse the same container where possible.
 # This significantly speeds up tests, but increases the possibility of test pollution.
@@ -278,7 +288,7 @@ fi
 export PASS_SYNAPSE_LOG_TESTING=1
 
 # Run the tests!
-echo "Images built; running complement with ${extra_test_args[@]} $@ $test_packages"
+echo "Images built; running complement with ${extra_test_args[@]} $@ ${test_packages[@]}"
 cd "$COMPLEMENT_DIR"
 
-go test -v -tags "synapse_blacklist" -count=1 "${extra_test_args[@]}" "$@" $test_packages
+go test -v -tags "synapse_blacklist" -count=1 "${extra_test_args[@]}" "$@" "${test_packages[@]}"
-- 
cgit 1.5.1


From 3818597751701e0d221608afe0a2fe7148a670a4 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erikj@element.io>
Date: Fri, 3 May 2024 17:12:03 +0100
Subject: Fix lint.sh script (#17148)

Broke in #17073
---
 changelog.d/17148.doc | 1 +
 scripts-dev/lint.sh   | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 changelog.d/17148.doc

(limited to 'scripts-dev')

diff --git a/changelog.d/17148.doc b/changelog.d/17148.doc
new file mode 100644
index 0000000000..bc33887efe
--- /dev/null
+++ b/changelog.d/17148.doc
@@ -0,0 +1 @@
+Remove broken sphinx docs.
diff --git a/scripts-dev/lint.sh b/scripts-dev/lint.sh
index 1c0e6582f6..9e4ed3246e 100755
--- a/scripts-dev/lint.sh
+++ b/scripts-dev/lint.sh
@@ -91,7 +91,6 @@ else
           "synapse" "docker" "tests"
           "scripts-dev"
           "contrib" "synmark" "stubs" ".ci"
-          "dev-docs"
       )
   fi
 fi
-- 
cgit 1.5.1