summaryrefslogtreecommitdiff
path: root/azure-pipelines
diff options
context:
space:
mode:
Diffstat (limited to 'azure-pipelines')
-rw-r--r--azure-pipelines/templates/linux-build.yml2
-rw-r--r--azure-pipelines/templates/release.yml26
2 files changed, 18 insertions, 10 deletions
diff --git a/azure-pipelines/templates/linux-build.yml b/azure-pipelines/templates/linux-build.yml
index 7f442904c..a173f3364 100644
--- a/azure-pipelines/templates/linux-build.yml
+++ b/azure-pipelines/templates/linux-build.yml
@@ -24,7 +24,7 @@ steps:
${{ if eq(parameters.Image, 'compile-farm-ci') }}:
displayName: 'Build and test'
# Run the commit-checker only if it is a Pull Request
- condition: and(succeeded(), or(ne(variables['Agent.JobName'], 'commit-checker'), eq(variables['Build.Reason'], 'PullRequest')))
+ condition: and(succeeded(), or(not(contains(variables['Agent.JobName'], 'commit-checker')), eq(variables['Build.Reason'], 'PullRequest')))
inputs:
command: 'Run an image'
imageName: openttd/${{ parameters.Image }}:${{ parameters.Tag }}
diff --git a/azure-pipelines/templates/release.yml b/azure-pipelines/templates/release.yml
index 7628d3c91..0297782f1 100644
--- a/azure-pipelines/templates/release.yml
+++ b/azure-pipelines/templates/release.yml
@@ -110,14 +110,22 @@ jobs:
strategy:
matrix:
- linux-ubuntu-xenial-i386-gcc: {}
- linux-ubuntu-xenial-amd64-gcc: {}
- linux-ubuntu-bionic-i386-gcc: {}
- linux-ubuntu-bionic-amd64-gcc: {}
- linux-debian-jessie-i386-gcc: {}
- linux-debian-jessie-amd64-gcc: {}
- linux-debian-stretch-i386-gcc: {}
- linux-debian-stretch-amd64-gcc: {}
+ linux-ubuntu-xenial-i386-gcc:
+ Tag: 'linux-ubuntu-xenial-i386-gcc'
+ linux-ubuntu-xenial-amd64-gcc:
+ Tag: 'linux-ubuntu-xenial-amd64-gcc'
+ linux-ubuntu-bionic-i386-gcc:
+ Tag: 'linux-ubuntu-bionic-i386-gcc'
+ linux-ubuntu-bionic-amd64-gcc:
+ Tag: 'linux-ubuntu-bionic-amd64-gcc'
+ linux-debian-jessie-i386-gcc:
+ Tag: 'linux-ubuntu-jessie-i386-gcc'
+ linux-debian-jessie-amd64-gcc:
+ Tag: 'linux-ubuntu-jessie-amd64-gcc'
+ linux-debian-stretch-i386-gcc:
+ Tag: 'linux-ubuntu-stretch-i386-gcc'
+ linux-debian-stretch-amd64-gcc:
+ Tag: 'linux-ubuntu-stretch-amd64-gcc'
steps:
- template: release-fetch-source.yml
@@ -125,7 +133,7 @@ jobs:
parameters:
Image: compile-farm
ContainerCommand: '$(Build.BuildNumber)'
- Tag: $(Agent.JobName)
+ Tag: $(Tag)
- template: linux-claim-bundles.yml
- template: release-bundles.yml