Fix: [AzurePipelines] don't assume master as target branch when rebasing PRs
parent
e8d397e4ee
commit
e4cc06f67e
@ -1,9 +1,9 @@
|
|||||||
steps:
|
steps:
|
||||||
# Rebase to origin/master for every PR. This means users don't have to
|
# Rebase to target branch for every PR. This means users don't have to
|
||||||
# rebase every time master changes. As long as the PR applies cleanly, we
|
# rebase every time target branch changes. As long as the PR applies cleanly, we
|
||||||
# will validate it.
|
# will validate it.
|
||||||
- script: |
|
- bash: |
|
||||||
git config user.email 'info@openttd.org'
|
git config user.email 'info@openttd.org'
|
||||||
git config user.name 'OpenTTD CI'
|
git config user.name 'OpenTTD CI'
|
||||||
git rebase origin/master
|
git rebase origin/$SYSTEM_PULLREQUEST_TARGETBRANCH
|
||||||
displayName: 'Rebase to master'
|
displayName: 'Rebase to $(System.PullRequest.TargetBranch)'
|
||||||
|
Loading…
Reference in New Issue