summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorglx <glx@openttd.org>2019-03-10 00:44:21 +0100
committerglx22 <glx22@users.noreply.github.com>2019-03-10 01:02:59 +0100
commit26b0615c476039c43b4a845c6b01d590d1fb20dd (patch)
tree6b4710564b4280646bafab7f99948800d3726792
parente4cc06f67ecec6ba074955650696237cb28fe956 (diff)
downloadopenttd-26b0615c476039c43b4a845c6b01d590d1fb20dd.tar.xz
Fix e4cc06f67: [AzurePipelines] rebase only for PRs
-rw-r--r--azure-pipelines/templates/ci-git-rebase.yml3
1 files changed, 2 insertions, 1 deletions
diff --git a/azure-pipelines/templates/ci-git-rebase.yml b/azure-pipelines/templates/ci-git-rebase.yml
index 19deb2f6d..514c66744 100644
--- a/azure-pipelines/templates/ci-git-rebase.yml
+++ b/azure-pipelines/templates/ci-git-rebase.yml
@@ -5,5 +5,6 @@ steps:
- 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'))