cpp/openttd-patchpack/source Changeset - r23702:a30bc36d2983

Changeset - r23702:a30bc36d2983

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

glx22 - 5 years ago 2019-05-02 20:17:09
glx22@users.noreply.github.com

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

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

* Fix: [AzurePipeline] also update commit-checker condition

3 files changed with 27 insertions and 15 deletions:

azure-pipelines-ci.yml

azure-pipelines/templates/linux-build.yml

azure-pipelines/templates/release.yml

0 comments (0 inline, 0 general)

azure-pipelines-ci.yml

➞

Show inline comments

@@ @@ -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'

azure-pipelines/templates/linux-build.yml

➞

Show inline comments

@@ @@ -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 }}

azure-pipelines/templates/release.yml

➞

Show inline comments

@@ @@ -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

0 comments (0 inline, 0 general)