mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix: [AzurePipeline] ${Agent.JobName} content changed (#7556) 

* Fix: [AzurePipeline] ${Agent.JobName} content changed

* Fix: [AzurePipeline] also update commit-checker condition
This commit is contained in:
glx22 2019-05-02 22:17:09 +02:00 committed by Charles Pigott
parent b61ef7e0d2
commit e526b2ccd3
3 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
azure-pipelines-ci.yml
View File

@ -38,10 +38,14 @@ jobs:
strategy: strategy:
matrix: matrix:
commit-checker: {} commit-checker:
linux-amd64-clang-3.8: {} Tag: 'commit-checker'
linux-amd64-gcc-6: {} linux-amd64-clang-3.8:
linux-i386-gcc-6: {} Tag: 'linux-amd64-clang-3.8'
linux-amd64-gcc-6:
Tag: 'linux-amd64-gcc-6'
linux-i386-gcc-6:
Tag: 'linux-i386-gcc-6'
steps: steps:
- template: azure-pipelines/templates/ci-git-rebase.yml - template: azure-pipelines/templates/ci-git-rebase.yml
@ -50,7 +54,7 @@ jobs:
- template: azure-pipelines/templates/linux-build.yml - template: azure-pipelines/templates/linux-build.yml
parameters: parameters:
Image: compile-farm-ci Image: compile-farm-ci
Tag: $(Agent.JobName) Tag: $(Tag)
- job: macos - job: macos
displayName: 'MacOS' displayName: 'MacOS'

2
azure-pipelines/templates/linux-build.yml
View File

@ -24,7 +24,7 @@ steps:
${{ if eq(parameters.Image, 'compile-farm-ci') }}: ${{ if eq(parameters.Image, 'compile-farm-ci') }}:
displayName: 'Build and test' displayName: 'Build and test'
# Run the commit-checker only if it is a Pull Request # 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: inputs:
command: 'Run an image' command: 'Run an image'
imageName: openttd/${{ parameters.Image }}:${{ parameters.Tag }} imageName: openttd/${{ parameters.Image }}:${{ parameters.Tag }}

26
azure-pipelines/templates/release.yml
View File

@ -110,14 +110,22 @@ jobs:
strategy: strategy:
matrix: matrix:
linux-ubuntu-xenial-i386-gcc: {} linux-ubuntu-xenial-i386-gcc:
linux-ubuntu-xenial-amd64-gcc: {} Tag: 'linux-ubuntu-xenial-i386-gcc'
linux-ubuntu-bionic-i386-gcc: {} linux-ubuntu-xenial-amd64-gcc:
linux-ubuntu-bionic-amd64-gcc: {} Tag: 'linux-ubuntu-xenial-amd64-gcc'
linux-debian-jessie-i386-gcc: {} linux-ubuntu-bionic-i386-gcc:
linux-debian-jessie-amd64-gcc: {} Tag: 'linux-ubuntu-bionic-i386-gcc'
linux-debian-stretch-i386-gcc: {} linux-ubuntu-bionic-amd64-gcc:
linux-debian-stretch-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: steps:
- template: release-fetch-source.yml - template: release-fetch-source.yml
@ -125,7 +133,7 @@ jobs:
parameters: parameters:
Image: compile-farm Image: compile-farm
ContainerCommand: '$(Build.BuildNumber)' ContainerCommand: '$(Build.BuildNumber)'
Tag: $(Agent.JobName) Tag: $(Tag)
- template: linux-claim-bundles.yml - template: linux-claim-bundles.yml
- template: release-bundles.yml - template: release-bundles.yml