diff options
| author | glx22 <glx22@users.noreply.github.com> | 2019-05-02 22:17:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-02 22:17:09 +0200 |
| commit | 8fc2b48db70b89e57d055e4686e49b583574d927 (patch) | |
| tree | 264d71cecfa4bb7a5817b920f80f1c9f045e27c0 | |
| parent | 3469a2a4452099e4f7e8441693472d4c7333e1f3 (diff) | |
| download | openttd-8fc2b48db70b89e57d055e4686e49b583574d927.tar.xz | |
Fix: [AzurePipeline] ${Agent.JobName} content changed (#7556)
* Fix: [AzurePipeline] ${Agent.JobName} content changed
* Fix: [AzurePipeline] also update commit-checker condition
| -rw-r--r-- | azure-pipelines-ci.yml | 14 | ||||
| -rw-r--r-- | azure-pipelines/templates/linux-build.yml | 2 | ||||
| -rw-r--r-- | azure-pipelines/templates/release.yml | 26 |
3 files changed, 27 insertions, 15 deletions
diff --git a/azure-pipelines-ci.yml b/azure-pipelines-ci.yml index 789f8f6a3..19c185894 100644 --- a/azure-pipelines-ci.yml +++ b/azure-pipelines-ci.yml @@ -38,10 +38,14 @@ jobs: strategy: matrix: - commit-checker: {} - linux-amd64-clang-3.8: {} - linux-amd64-gcc-6: {} - linux-i386-gcc-6: {} + commit-checker: + Tag: 'commit-checker' + linux-amd64-clang-3.8: + 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: - template: azure-pipelines/templates/ci-git-rebase.yml @@ -50,7 +54,7 @@ jobs: - template: azure-pipelines/templates/linux-build.yml parameters: Image: compile-farm-ci - Tag: $(Agent.JobName) + Tag: $(Tag) - job: macos displayName: 'MacOS' 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 |