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

Try fetching more branches for PRs 

Attempt both the PR author's branch and the PR's target branch. This resolves
issues on experimental where we need riot-web to also be experimental.
pull/21833/head
J. Ryan Stinnett 2018-12-20 22:13:40 +00:00
parent 418bfbb3dc
commit 7affd5fcff
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
scripts/fetchdep.sh
View File

@ -1,22 +1,24 @@
#!/bin/sh #!/bin/sh
set -e
org="$1" org="$1"
repo="$2" repo="$2"
rm -r "$repo" || true rm -r "$repo" || true
curbranch="$TRAVIS_PULL_REQUEST_BRANCH" clone() {
[ -z "$curbranch" ] && curbranch="$TRAVIS_BRANCH" branch=$1
[ -z "$curbranch" ] && curbranch=`"echo $GIT_BRANCH" | sed -e 's/^origin\///'` # jenkins if [ -n "$branch" ]
if [ -n "$curbranch" ]
then then
echo "Determined branch to be $curbranch" echo "Trying to use the branch $branch"
git clone https://github.com/$org/$repo.git $repo --branch "$branch" && exit 0
git clone https://github.com/$org/$repo.git $repo --branch "$curbranch" && exit 0
fi fi
}
echo "Checking out develop branch" # Try the PR author's branch in case it exists on the deps as well.
git clone https://github.com/$org/$repo.git $repo --branch develop clone $TRAVIS_PULL_REQUEST_BRANCH
# Try the target branch of the push or PR.
clone $TRAVIS_BRANCH
# Try the current branch from Jenkins.
clone `"echo $GIT_BRANCH" | sed -e 's/^origin\///'`
# Use develop as the last resort.
clone develop