Przeglądaj źródła

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.
tags/v1.51.0rc1
Nicolas Werner 2 lat temu
committed by GitHub
rodzic
commit
fa583c2198
Nie znaleziono w bazie danych klucza dla tego podpisu ID klucza GPG: 4AEE18F83AFDEB23
3 zmienionych plików z 10 dodań i 7 usunięć
  1. +1
    -1
      .gitignore
  2. +1
    -0
      changelog.d/11766.misc
  3. +8
    -6
      scripts-dev/complement.sh

+ 1
- 1
.gitignore Wyświetl plik

@@ -52,5 +52,5 @@ __pycache__/
book/

# complement
/complement-master
/complement-*
/master.tar.gz

+ 1
- 0
changelog.d/11766.misc Wyświetl plik

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

+ 8
- 6
scripts-dev/complement.sh Wyświetl plik

@@ -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.
@@ -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


Ładowanie…
Anuluj
Zapisz