cpp/openttd-patchpack/source Changeset - r23439:19bd53812e56

Changeset - r23439:19bd53812e56

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

glx - 5 years ago 2019-03-09 23:44:21
glx@openttd.org

Fix e4cc06f67: [AzurePipelines] rebase only for PRs

1 file changed with 2 insertions and 1 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 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.
 - bash: |
     git config user.email 'info@openttd.org'
     git config user.name 'OpenTTD CI'
     git rebase origin/$SYSTEM_PULLREQUEST_TARGETBRANCH
+    git rebase origin/${SYSTEM_PULLREQUEST_TARGETBRANCH}
   displayName: 'Rebase to $(System.PullRequest.TargetBranch)'
   condition: and(succeeded(), eq(variables['Build.Reason'], 'PullRequest'))

0 comments (0 inline, 0 general)