From dcdd8891b12378a3711e093c983b5034f6717361 Mon Sep 17 00:00:00 2001 From: Gregor Date: Wed, 25 Oct 2023 19:18:42 +0200 Subject: [PATCH] try something else --- buildkite/scripts/merges-cleanly.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildkite/scripts/merges-cleanly.sh b/buildkite/scripts/merges-cleanly.sh index 71f6a566800..b90f721ec2c 100755 --- a/buildkite/scripts/merges-cleanly.sh +++ b/buildkite/scripts/merges-cleanly.sh @@ -2,7 +2,7 @@ BRANCH=$1 CURRENT=$(git branch --show-current) -echo 'Testing for conflicts between the current branch `'"${CURRENT}"'` and `'"${BRANCH}"'`...' +echo 'Testing for conflicts between the current branch `'"${BUILDKITE_BRANCH}"'` and `'"${BRANCH}"'`...' # Adapted from this stackoverflow answer: https://stackoverflow.com/a/10856937 # The git merge-tree command shows the content of a 3-way merge without @@ -33,7 +33,7 @@ if [ $RET -eq 0 ]; then exit 0 else # exclude branches for which merging cleanly is not a hard requirement - if [ "${CURRENT}" == "o1js-main" ]; then + if [ "${BUILDKITE_BRANCH}" == "o1js-main" ]; then echo "Conflicts were found, but the current branch does not have to merge cleanly. Exiting with code 0." exit 0 fi