diff options
| author | Nicolas Werner <89468146+nico-famedly@users.noreply.github.com> | 2022-02-23 10:06:18 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-23 10:06:18 +0000 |
| commit | c1ac2a81350f3b5b86f4c53a585eccd17e3b8e75 (patch) | |
| tree | ae00c947dff6826d22b348153dc5bd1d79ef4ef2 | |
| parent | Remove excess condition on `knock->leave` check (#11900) (diff) | |
| download | synapse-c1ac2a81350f3b5b86f4c53a585eccd17e3b8e75.tar.xz | |
Rename default branch of complement.sh to main (#12063)
The complement.sh script relies on the name of the ref matching the name of the unpacked folder. The branch redirect from renaming the default branch breaks that assumption. Signed-off-by: Nicolas Werner <n.werner@famedly.com>
| -rw-r--r-- | changelog.d/12063.misc | 1 | ||||
| -rwxr-xr-x | scripts-dev/complement.sh | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/changelog.d/12063.misc b/changelog.d/12063.misc new file mode 100644 index 0000000000..e48c5dd08b --- /dev/null +++ b/changelog.d/12063.misc @@ -0,0 +1 @@ +Fix using the complement.sh script without specifying a dir or a branch. Contributed by Nico on behalf of Famedly. diff --git a/scripts-dev/complement.sh b/scripts-dev/complement.sh index e08ffedaf3..0aecb3daf1 100755 --- a/scripts-dev/complement.sh +++ b/scripts-dev/complement.sh @@ -5,7 +5,7 @@ # It makes a Synapse image which represents the current checkout, # builds a synapse-complement image on top, then runs tests with it. # -# By default the script will fetch the latest Complement master branch and +# By default the script will fetch the latest Complement main branch and # run tests with that. This can be overridden to use a custom Complement # checkout by setting the COMPLEMENT_DIR environment variable to the # filepath of a local Complement checkout or by setting the COMPLEMENT_REF @@ -32,7 +32,7 @@ cd "$(dirname $0)/.." # Check for a user-specified Complement checkout if [[ -z "$COMPLEMENT_DIR" ]]; then - COMPLEMENT_REF=${COMPLEMENT_REF:-master} + COMPLEMENT_REF=${COMPLEMENT_REF:-main} echo "COMPLEMENT_DIR not set. Fetching Complement checkout from ${COMPLEMENT_REF}..." wget -Nq https://github.com/matrix-org/complement/archive/${COMPLEMENT_REF}.tar.gz tar -xzf ${COMPLEMENT_REF}.tar.gz |