OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Allow overriding the complement ref. (#11766) 

Updates complement.sh to read the ref from an environment
variable (defaulting to master) when downloading a complement
bundle for testing.
pull/11782/head
Nicolas Werner 2022-01-20 13:04:58 +00:00 committed by GitHub
parent af13a3be29
commit fa583c2198
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -52,5 +52,5 @@ __pycache__/
book/ book/
# complement # complement
/complement-master /complement-*
/master.tar.gz /master.tar.gz

1
changelog.d/11766.misc Normal file
View File

@ -0,0 +1 @@
Allow overriding complement commit using `COMPLEMENT_REF`.

14
scripts-dev/complement.sh
View File

@ -8,7 +8,8 @@
# By default the script will fetch the latest Complement master branch and # By default the script will fetch the latest Complement master 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. # filepath of a local Complement checkout or by setting the COMPLEMENT_REF
# environment variable to pull a different branch or commit.
# #
# By default Synapse is run in monolith mode. This can be overridden by # By default Synapse is run in monolith mode. This can be overridden by
# setting the WORKERS environment variable. # setting the WORKERS environment variable.
@ -31,11 +32,12 @@ 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
echo "COMPLEMENT_DIR not set. Fetching the latest Complement checkout..." COMPLEMENT_REF=${COMPLEMENT_REF:-master}
wget -Nq https://github.com/matrix-org/complement/archive/master.tar.gz echo "COMPLEMENT_DIR not set. Fetching Complement checkout from ${COMPLEMENT_REF}..."
tar -xzf master.tar.gz wget -Nq https://github.com/matrix-org/complement/archive/${COMPLEMENT_REF}.tar.gz
COMPLEMENT_DIR=complement-master tar -xzf ${COMPLEMENT_REF}.tar.gz
echo "Checkout available at 'complement-master'" COMPLEMENT_DIR=complement-${COMPLEMENT_REF}
echo "Checkout available at 'complement-${COMPLEMENT_REF}'"
fi fi
# Build the base Synapse image from the local checkout # Build the base Synapse image from the local checkout