Skip to content

Commit

Permalink
Allow overriding the complement ref. (matrix-org#11766)
Browse files Browse the repository at this point in the history
Updates complement.sh to read the ref from an environment
variable (defaulting to master) when downloading a complement
bundle for testing.
  • Loading branch information
nico-famedly authored Jan 20, 2022
1 parent af13a3b commit fa583c2
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -52,5 +52,5 @@ __pycache__/
book/

# complement
/complement-master
/complement-*
/master.tar.gz
1 change: 1 addition & 0 deletions changelog.d/11766.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Allow overriding complement commit using `COMPLEMENT_REF`.
14 changes: 8 additions & 6 deletions scripts-dev/complement.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
# 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
# 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
# setting the WORKERS environment variable.
Expand All @@ -31,11 +32,12 @@ cd "$(dirname $0)/.."

# Check for a user-specified Complement checkout
if [[ -z "$COMPLEMENT_DIR" ]]; then
echo "COMPLEMENT_DIR not set. Fetching the latest Complement checkout..."
wget -Nq https://github.com/matrix-org/complement/archive/master.tar.gz
tar -xzf master.tar.gz
COMPLEMENT_DIR=complement-master
echo "Checkout available at 'complement-master'"
COMPLEMENT_REF=${COMPLEMENT_REF:-master}
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
COMPLEMENT_DIR=complement-${COMPLEMENT_REF}
echo "Checkout available at 'complement-${COMPLEMENT_REF}'"
fi

# Build the base Synapse image from the local checkout
Expand Down

0 comments on commit fa583c2

Please sign in to comment.