diff options
| author | glx <glx@openttd.org> | 2019-03-09 22:31:47 +0100 |
|---|---|---|
| committer | Charles Pigott <charlespigott@googlemail.com> | 2019-03-09 22:30:19 +0000 |
| commit | e4cc06f67ecec6ba074955650696237cb28fe956 (patch) | |
| tree | eb9d684e0a2ea2c011bd7fa4f89a66656b68e282 | |
| parent | e8d397e4ee71fa9aa952a16fc2f8431dfff57f7c (diff) | |
| download | openttd-e4cc06f67ecec6ba074955650696237cb28fe956.tar.xz | |
Fix: [AzurePipelines] don't assume master as target branch when rebasing PRs
| -rw-r--r-- | azure-pipelines/templates/ci-git-rebase.yml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/azure-pipelines/templates/ci-git-rebase.yml b/azure-pipelines/templates/ci-git-rebase.yml index 924302fee..19deb2f6d 100644 --- a/azure-pipelines/templates/ci-git-rebase.yml +++ b/azure-pipelines/templates/ci-git-rebase.yml @@ -1,9 +1,9 @@ steps: -# Rebase to origin/master for every PR. This means users don't have to -# rebase every time master changes. As long as the PR applies cleanly, we +# Rebase to target branch for every PR. This means users don't have to +# rebase every time target branch changes. As long as the PR applies cleanly, we # will validate it. -- script: | +- bash: | git config user.email 'info@openttd.org' git config user.name 'OpenTTD CI' - git rebase origin/master - displayName: 'Rebase to master' + git rebase origin/$SYSTEM_PULLREQUEST_TARGETBRANCH + displayName: 'Rebase to $(System.PullRequest.TargetBranch)' |