diff options
| author | David Robertson <davidr@element.io> | 2021-08-12 13:05:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-12 13:05:23 +0100 |
| commit | 4a76d01ff7e063354e4d1b9333891559ab72c1bf (patch) | |
| tree | 0f5f2eeb808e9e0687d20489060a31bf00104da9 /.buildkite/merge_base_branch.sh | |
| parent | Update the pagination parameter name based on MSC2946 review. (#10579) (diff) | |
| parent | Remove buildkite-era comment (diff) | |
| download | synapse-4a76d01ff7e063354e4d1b9333891559ab72c1bf.tar.xz | |
Merge pull request #10573 from DMRobertson/dmr/goodbye-buildkite
Remove references to BuildKite in favour of GitHub Actions
Diffstat (limited to '.buildkite/merge_base_branch.sh')
| -rwxr-xr-x | .buildkite/merge_base_branch.sh | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/.buildkite/merge_base_branch.sh b/.buildkite/merge_base_branch.sh deleted file mode 100755 index 361440fd1a..0000000000 --- a/.buildkite/merge_base_branch.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env bash - -set -e - -if [[ "$BUILDKITE_BRANCH" =~ ^(develop|master|dinsic|shhs|release-.*)$ ]]; then - echo "Not merging forward, as this is a release branch" - exit 0 -fi - -if [[ -z $BUILDKITE_PULL_REQUEST_BASE_BRANCH ]]; then - echo "Not a pull request, or hasn't had a PR opened yet..." - - # It probably hasn't had a PR opened yet. Since all PRs land on develop, we - # can probably assume it's based on it and will be merged into it. - GITBASE="develop" -else - # Get the reference, using the GitHub API - GITBASE=$BUILDKITE_PULL_REQUEST_BASE_BRANCH -fi - -echo "--- merge_base_branch $GITBASE" - -# Show what we are before -git --no-pager show -s - -# Set up username so it can do a merge -git config --global user.email bot@matrix.org -git config --global user.name "A robot" - -# Fetch and merge. If it doesn't work, it will raise due to set -e. -git fetch -u origin $GITBASE -git merge --no-edit --no-commit origin/$GITBASE - -# Show what we are after. -git --no-pager show -s |