Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Commit c1ac2a8

Browse files
authored
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>
1 parent e3fe634 commit c1ac2a8

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

changelog.d/12063.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix using the complement.sh script without specifying a dir or a branch. Contributed by Nico on behalf of Famedly.

scripts-dev/complement.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# It makes a Synapse image which represents the current checkout,
66
# builds a synapse-complement image on top, then runs tests with it.
77
#
8-
# By default the script will fetch the latest Complement master branch and
8+
# By default the script will fetch the latest Complement main branch and
99
# run tests with that. This can be overridden to use a custom Complement
1010
# checkout by setting the COMPLEMENT_DIR environment variable to the
1111
# filepath of a local Complement checkout or by setting the COMPLEMENT_REF
@@ -32,7 +32,7 @@ cd "$(dirname $0)/.."
3232

3333
# Check for a user-specified Complement checkout
3434
if [[ -z "$COMPLEMENT_DIR" ]]; then
35-
COMPLEMENT_REF=${COMPLEMENT_REF:-master}
35+
COMPLEMENT_REF=${COMPLEMENT_REF:-main}
3636
echo "COMPLEMENT_DIR not set. Fetching Complement checkout from ${COMPLEMENT_REF}..."
3737
wget -Nq https://github.com/matrix-org/complement/archive/${COMPLEMENT_REF}.tar.gz
3838
tar -xzf ${COMPLEMENT_REF}.tar.gz

0 commit comments

Comments
 (0)