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.
This commit is contained in:
parent
418bfbb3dc
commit
7affd5fcff
1 changed files with 16 additions and 14 deletions
|
@ -1,22 +1,24 @@
|
|||
#!/bin/sh
|
||||
|
||||
set -e
|
||||
|
||||
org="$1"
|
||||
repo="$2"
|
||||
|
||||
rm -r "$repo" || true
|
||||
|
||||
curbranch="$TRAVIS_PULL_REQUEST_BRANCH"
|
||||
[ -z "$curbranch" ] && curbranch="$TRAVIS_BRANCH"
|
||||
[ -z "$curbranch" ] && curbranch=`"echo $GIT_BRANCH" | sed -e 's/^origin\///'` # jenkins
|
||||
|
||||
if [ -n "$curbranch" ]
|
||||
clone() {
|
||||
branch=$1
|
||||
if [ -n "$branch" ]
|
||||
then
|
||||
echo "Determined branch to be $curbranch"
|
||||
|
||||
git clone https://github.com/$org/$repo.git $repo --branch "$curbranch" && exit 0
|
||||
echo "Trying to use the branch $branch"
|
||||
git clone https://github.com/$org/$repo.git $repo --branch "$branch" && exit 0
|
||||
fi
|
||||
}
|
||||
|
||||
echo "Checking out develop branch"
|
||||
git clone https://github.com/$org/$repo.git $repo --branch develop
|
||||
# Try the PR author's branch in case it exists on the deps as well.
|
||||
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
|
||||
|
|
Loading…
Reference in a new issue