From f2bba892e064c0fb6ee9c1f5ec74fc3827890e4e Mon Sep 17 00:00:00 2001
From: Michael Kaye <1917473+michaelkaye@users.noreply.github.com>
Date: Thu, 25 Nov 2021 10:16:30 +0000
Subject: [PATCH 1/4] Ignore generated files from scripts-dev/complement.sh.

These are a download of the complement server when COMPLEMENT_DIR env is not set
and are test-time only.
---
 .gitignore | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitignore b/.gitignore
index fe137f337019..8eb4eda73d71 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,3 +50,7 @@ __pycache__/
 
 # docs
 book/
+
+# complement
+/complement-master
+/master.tar.gz

From ce9c1bc0c98e4f5c82a15670398e2db2fa914bb6 Mon Sep 17 00:00:00 2001
From: Michael Kaye <1917473+michaelkaye@users.noreply.github.com>
Date: Thu, 25 Nov 2021 10:17:19 +0000
Subject: [PATCH 2/4] Swap to COMPLEMENT_SPAWN_HS_TIMEOUT_SECS env var.

This was changed in matrix-org/complement#232 and the result should be
identical (50ms * 500 == 25s)
---
 scripts-dev/complement.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts-dev/complement.sh b/scripts-dev/complement.sh
index 53295b58fca9..820427be9e48 100755
--- a/scripts-dev/complement.sh
+++ b/scripts-dev/complement.sh
@@ -47,7 +47,7 @@ if [[ -n "$WORKERS" ]]; then
   COMPLEMENT_DOCKERFILE=SynapseWorkers.Dockerfile
   # And provide some more configuration to complement.
   export COMPLEMENT_CA=true
-  export COMPLEMENT_VERSION_CHECK_ITERATIONS=500
+  export COMPLEMENT_SPAWN_HS_TIMEOUT_SECS=25
 else
   export COMPLEMENT_BASE_IMAGE=complement-synapse
   COMPLEMENT_DOCKERFILE=Synapse.Dockerfile

From 7baf065b9d930daecf69ca315cc577558207516a Mon Sep 17 00:00:00 2001
From: Michael Kaye <1917473+michaelkaye@users.noreply.github.com>
Date: Mon, 10 Jan 2022 17:00:51 +0000
Subject: [PATCH 3/4] changelog.d

---
 changelog.d/11718.misc | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/11718.misc

diff --git a/changelog.d/11718.misc b/changelog.d/11718.misc
new file mode 100644
index 000000000000..63105aa83552
--- /dev/null
+++ b/changelog.d/11718.misc
@@ -0,0 +1 @@
+Complement environment variable name change and .gitignore expansion.

From 688951c2b595e77a06a99bedce56de68bfefa761 Mon Sep 17 00:00:00 2001
From: Patrick Cloke <clokep@users.noreply.github.com>
Date: Mon, 10 Jan 2022 17:51:40 -0500
Subject: [PATCH 4/4] Update changelog.

---
 changelog.d/11718.misc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog.d/11718.misc b/changelog.d/11718.misc
index 63105aa83552..91dc5b5874f9 100644
--- a/changelog.d/11718.misc
+++ b/changelog.d/11718.misc
@@ -1 +1 @@
-Complement environment variable name change and .gitignore expansion.
+Complement environment variable name change and update `.gitignore`.