Skip to content

Buildkite: Try same-named branches when cloning core repos, for PRs originating from official dlang repos #452

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Buildkite: Try same-named branches when cloning core repos, for PRs originating from official dlang repos #452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82e0410
Buildkite: Try same-named branches when cloning core repos, for PRs o…
kinke Jan 31, 2022
8e3153d
[test]
kinke Jan 31, 2022
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
1 change: 1 addition & 0 deletions buildkite/clone_repositories.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
origin_repo="$(echo "$BUILDKITE_REPO" | sed "s/.*\/\([^\]*\)[.]git/\1/")"

echo "--- Cloning all core repositories"
echo "BUILDKITE_PULL_REQUEST_REPO='${BUILDKITE_PULL_REQUEST_REPO:-}'"
repositories=(dmd druntime phobos tools dub)

# For PRs to dlang/ci, clone itself too, s.t. the code below can be tested
Expand Down
7 changes: 6 additions & 1 deletion buildkite/origin_target_branch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,12 @@ fi
if [ $# -eq 2 ]; then
origin_target_branch="$2"
else
origin_target_branch="${BUILDKITE_PULL_REQUEST_BASE_BRANCH:-$BUILDKITE_BRANCH}"
if [[ "${BUILDKITE_PULL_REQUEST_REPO:-}" =~ github\.com/dlang/ ]]; then
# PR from official dlang repo - try same-named branches for the other repos
origin_target_branch="$BUILDKITE_BRANCH"
else
origin_target_branch="${BUILDKITE_PULL_REQUEST_BASE_BRANCH:-$BUILDKITE_BRANCH}"
fi
fi

if [ "$origin_target_branch" == "master" ] || [ "$origin_target_branch" == "stable" ] ; then
Expand Down