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

Commit

Permalink
Support CI for matching branches on forks
Browse files Browse the repository at this point in the history
Currently, people with push access to the main Riot repos can push matching
branch names to Riot and the SDKs, and CI will test all the branches together.
This change allows contributors to access the same ability when submitting
several matching PRs from their fork of each repo.

Part of element-hq/element-web#9041
  • Loading branch information
jryans committed Mar 19, 2019
1 parent bb111dc commit b3e910e
Showing 1 changed file with 22 additions and 10 deletions.
32 changes: 22 additions & 10 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

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

0 comments on commit b3e910e

Please sign in to comment.