OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix branch matching for BuildKite

pull/21833/head
Germain Souquet 2021-06-22 09:31:15 +01:00
parent 9fa7ac21bd
commit 8090d2b583
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
scripts/fetchdep.sh
View File

@ -25,18 +25,20 @@ clone() {
# First we check if GITHUB_HEAD_REF is defined, # First we check if GITHUB_HEAD_REF is defined,
# Then we check if BUILDKITE_BRANCH is defined, # Then we check if BUILDKITE_BRANCH is defined,
# if it isn't we can assume this is a Netlify build # if it isn't we can assume this is a Netlify build
if [ -n ${GITHUB_HEAD_REF+x} ]; then if [ -z ${BUILDKITE_BRANCH+x} ]; then
head=$GITHUB_HEAD_REF if [ -z ${GITHUB_HEAD_REF+x} ]; then
elif [ -n ${BUILDKITE_BRANCH+x} ]; then
head=$BUILDKITE_BRANCH
else
# Netlify doesn't give us info about the fork so we have to get it from GitHub API # Netlify doesn't give us info about the fork so we have to get it from GitHub API
apiEndpoint="https://api.github.com/repos/matrix-org/matrix-react-sdk/pulls/" apiEndpoint="https://api.github.com/repos/matrix-org/matrix-react-sdk/pulls/"
apiEndpoint+=$REVIEW_ID apiEndpoint+=$REVIEW_ID
head=$(curl $apiEndpoint | jq -r '.head.label') head=$(curl $apiEndpoint | jq -r '.head.label')
else
head=$GITHUB_HEAD_REF
fi
else
head=$BUILDKITE_BRANCH
fi fi
# If head is set, it will contain on BuilKite either: # If head is set, it will contain on BuildKite either:
# * "branch" when the author's branch and target branch are in the same repo # * "branch" when the author's branch and target branch are in the same repo
# * "fork:branch" when the author's branch is in their fork or if this is a Netlify build # * "fork:branch" when the author's branch is in their fork or if this is a Netlify build
# We can split on `:` into an array to check. # We can split on `:` into an array to check.
@ -44,11 +46,16 @@ fi
# to determine whether the branch is from a fork or not # to determine whether the branch is from a fork or not
BRANCH_ARRAY=(${head//:/ }) BRANCH_ARRAY=(${head//:/ })
if [[ "${#BRANCH_ARRAY[@]}" == "1" ]]; then if [[ "${#BRANCH_ARRAY[@]}" == "1" ]]; then
if [[ "$GITHUB_REPOSITORY" = "$deforg/$defrepo" ]]; then if [ -z ${BUILDKITE_BRANCH+x} ]; then
clone $deforg $defrepo $head if [[ "$GITHUB_REPOSITORY" == "$deforg"* ]]; then
clone $deforg $defrepo $GITHUB_HEAD_REF
else else
clone $GITHUB_ACTOR $defrepo $head clone $GITHUB_ACTOR $defrepo $GITHUB_HEAD_REF
fi fi
else
clone $deforg $defrepo $BUILDKITE_BRANCH
fi
elif [[ "${#BRANCH_ARRAY[@]}" == "2" ]]; then elif [[ "${#BRANCH_ARRAY[@]}" == "2" ]]; then
clone ${BRANCH_ARRAY[0]} $defrepo ${BRANCH_ARRAY[1]} clone ${BRANCH_ARRAY[0]} $defrepo ${BRANCH_ARRAY[1]}
fi fi