mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-11-24 10:35:46 +03:00
Code Issues Projects Releases Packages Wiki Activity

Rename default branch of complement.sh to main (#12063)

Browse source 
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>
This commit is contained in:
Nicolas Werner 2022-02-23 10:06:18 +00:00 committed by GitHub
parent e3fe6347be
commit c1ac2a8135
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/12063.misc Normal file
View file

@ -0,0 +1 @@
Fix using the complement.sh script without specifying a dir or a branch. Contributed by Nico on behalf of Famedly.

4
scripts-dev/complement.sh
View file

@ -5,7 +5,7 @@
# It makes a Synapse image which represents the current checkout, # It makes a Synapse image which represents the current checkout,
# builds a synapse-complement image on top, then runs tests with it. # 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 # run tests with that. This can be overridden to use a custom Complement
# checkout by setting the COMPLEMENT_DIR environment variable to the # checkout by setting the COMPLEMENT_DIR environment variable to the
# filepath of a local Complement checkout or by setting the COMPLEMENT_REF # 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 # Check for a user-specified Complement checkout
if [[ -z "$COMPLEMENT_DIR" ]]; then 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}..." echo "COMPLEMENT_DIR not set. Fetching Complement checkout from ${COMPLEMENT_REF}..."
wget -Nq https://github.com/matrix-org/complement/archive/${COMPLEMENT_REF}.tar.gz wget -Nq https://github.com/matrix-org/complement/archive/${COMPLEMENT_REF}.tar.gz
tar -xzf ${COMPLEMENT_REF}.tar.gz tar -xzf ${COMPLEMENT_REF}.tar.gz