gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-02-07 23:10:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: [AzurePipelines] don't assume master as target branch when rebasing PRs

Browse Source
This commit is contained in:
glx 2019-03-09 22:31:47 +01:00 committed by Charles Pigott
parent e8d397e4ee
commit e4cc06f67e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
azure-pipelines/templates/ci-git-rebase.yml
View File

@ -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)'