Include image name in GH action job concurrency group

nuke-build · Nov 29, 2023 · 892020c · 892020c
1 parent b94f4c1
commit 892020c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/...erationTest.Test_testName=detailed-triggers_attribute=GitHubActionsAttribute.verified.txt b/...erationTest.Test_testName=detailed-triggers_attribute=GitHubActionsAttribute.verified.txt
@@ -50,7 +50,7 @@ jobs:
     runs-on: macos-latest
     timeout-minutes: 30
     concurrency:
-      group: ${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.run_id }}
+      group: ${{ github.workflow }} macos-latest @ ${{ github.event.pull_request.head.label || github.head_ref || github.run_id }}
       cancel-in-progress: true
     steps:
       - uses: actions/checkout@v3
@@ -93,7 +93,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 30
     concurrency:
-      group: ${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.run_id }}
+      group: ${{ github.workflow }} ubuntu-latest @ ${{ github.event.pull_request.head.label || github.head_ref || github.run_id }}
       cancel-in-progress: true
     steps:
       - uses: actions/checkout@v3
@@ -136,7 +136,7 @@ jobs:
     runs-on: windows-latest
     timeout-minutes: 30
     concurrency:
-      group: ${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.run_id }}
+      group: ${{ github.workflow }} windows-latest @ ${{ github.event.pull_request.head.label || github.head_ref || github.run_id }}
       cancel-in-progress: true
     steps:
       - uses: actions/checkout@v3

diff --git a/...I/ConfigurationGenerationTest.Test_testName=null_attribute=AppVeyorAttribute.verified.txt b/...I/ConfigurationGenerationTest.Test_testName=null_attribute=AppVeyorAttribute.verified.txt
@@ -35,10 +35,10 @@ build_script:
   - sh: ./build.cmd Test
 
 artifacts:
-  - path: src/*/obj/**
-  - path: src/*/bin/**
-  - path: output/test-results/*.trx
-  - path: output/test-results/*.xml
+  - path: 'src/*/obj/**'
+  - path: 'src/*/bin/**'
+  - path: 'output/test-results/*.trx'
+  - path: 'output/test-results/*.xml'
   - path: output/coverage-report.zip
 
 environment:

diff --git a/source/Nuke.Common/CI/GitHubActions/Configuration/GitHubActionsJob.cs b/source/Nuke.Common/CI/GitHubActions/Configuration/GitHubActionsJob.cs
@@ -45,7 +45,7 @@ public override void Write(CustomFileWriter writer)
                     {
                         // create a default value that only cancels in-progress runs of the same workflow
                         // we don't fall back to github.ref which would disable multiple runs in main/master which is usually what is wanted
-                        group = "${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.run_id }}";
+                        group = $"${{{{ github.workflow }}}} {Image.GetValue()} @ ${{{{ github.event.pull_request.head.label || github.head_ref || github.run_id }}}}";
                     }
 
                     writer.WriteLine($"group: {group}");