cpp/openttd-patchpack/source Changeset - r23438:07a061c5b9ef

Changeset - r23438:07a061c5b9ef

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

glx - 5 years ago 2019-03-09 21:31:47
glx@openttd.org

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

1 file changed with 5 insertions and 5 deletions:

azure-pipelines/templates/ci-git-rebase.yml

0 comments (0 inline, 0 general)

azure-pipelines/templates/ci-git-rebase.yml

➞

Show inline comments

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

0 comments (0 inline, 0 general)