From 9dd9b7985a7702324ff440729aab11cfe55db101 Mon Sep 17 00:00:00 2001 From: David Robertson Date: Thu, 9 Sep 2021 11:11:45 +0100 Subject: [PATCH] Fix missing `fi` in bootstrap.sh (#1133) I guess we never noticed this because no-one build and deployed the sytest containers? --- docker/bootstrap.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker/bootstrap.sh b/docker/bootstrap.sh index 836f3da3d..fc15cf59b 100755 --- a/docker/bootstrap.sh +++ b/docker/bootstrap.sh @@ -21,6 +21,8 @@ else # Otherwise, try and find the branch that the Synapse/Dendrite checkout # is using. Fall back to develop if unknown. branch_name="$(git --git-dir=/src/.git symbolic-ref HEAD 2>/dev/null)" || branch_name="develop" + fi + if [ "$SYTEST_TARGET" == "dendrite" ] && [ "$branch_name" == "master" ]; then # Dendrite uses master as its main branch. If the branch is master, we probably want sytest develop branch_name="develop"