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

Merge remote-tracking branch 'origin/develop' into dbkr/line_1_2

pull/21833/head
David Baker 2020-12-03 19:01:54 +00:00
parent 0b3c7e0972 0154c5aef1
commit 02d1249cfc
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/fetchdep.sh
View File

@ -34,7 +34,7 @@ elif [[ "${#BUILDKITE_BRANCH_ARRAY[@]}" == "2" ]]; then
fi fi
# Try the target branch of the push or PR. # Try the target branch of the push or PR.
clone $deforg $defrepo $BUILDKITE_PULL_REQUEST_BASE_BRANCH clone $deforg $defrepo $BUILDKITE_PULL_REQUEST_BASE_BRANCH
# Try the current branch from Jenkins. # Try HEAD which is the branch name in Netlify (not BRANCH which is pull/xxxx/head for PR builds)
clone $deforg $defrepo `"echo $GIT_BRANCH" | sed -e 's/^origin\///'` clone $deforg $defrepo $HEAD
# Use the default branch as the last resort. # Use the default branch as the last resort.
clone $deforg $defrepo $defbranch clone $deforg $defrepo $defbranch