Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Support CI for matching branches on forks #2807

Merged
merged 1 commit into from
Mar 20, 2019
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 23 additions & 11 deletions scripts/fetchdep.sh
Original file line number Diff line number Diff line change
@@ -1,28 +1,40 @@
#!/bin/sh
#!/bin/bash

org="$1"
repo="$2"
set -x

deforg="$1"
defrepo="$2"
defbranch="$3"

[ -z "$defbranch" ] && defbranch="develop"

rm -r "$repo" || true
rm -r "$defrepo" || true

clone() {
branch=$1
org=$1
repo=$2
branch=$3
if [ -n "$branch" ]
then
echo "Trying to use the branch $branch"
echo "Trying to use $org/$repo#$branch"
git clone https://github.com/$org/$repo.git $repo --branch "$branch" && exit 0
fi
}


# Try the PR author's branch in case it exists on the deps as well.
clone $BUILDKITE_BRANCH
# If BUILDKITE_BRANCH is set, it will contain either:
# * "branch" when the author's branch and target branch are in the same repo
# * "author:branch" when the author's branch is in their fork
# We can split on `:` into an array to check.
BUILDKITE_BRANCH_ARRAY=(${BUILDKITE_BRANCH//:/ })
if [[ "${#BUILDKITE_BRANCH_ARRAY[@]}" == "1" ]]; then
clone $deforg $defrepo $BUILDKITE_BRANCH
elif [[ "${#BUILDKITE_BRANCH_ARRAY[@]}" == "2" ]]; then
clone ${BUILDKITE_BRANCH_ARRAY[0]} $defrepo ${BUILDKITE_BRANCH_ARRAY[1]}
fi
# Try the target branch of the push or PR.
clone $BUILDKITE_PULL_REQUEST_BASE_BRANCH
clone $deforg $defrepo $BUILDKITE_PULL_REQUEST_BASE_BRANCH
# Try the current branch from Jenkins.
clone `"echo $GIT_BRANCH" | sed -e 's/^origin\///'`
clone $deforg $defrepo `"echo $GIT_BRANCH" | sed -e 's/^origin\///'`
# Use the default branch as the last resort.
clone $defbranch
clone $deforg $defrepo $defbranch