Converted name exitstatus to pattern usage

saltstack · Sep 24, 2024 · 3d58d55 · 3d58d55
1 parent 48a22b1
commit 3d58d55
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 13 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -49,7 +49,7 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: exitstatus
+          name: exitstatus-${{ github.job }}
           path: exitstatus/
 
   generate-actions-workflow:
@@ -86,7 +86,7 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: exitstatus
+          name: exitstatus-${{ github.job }}
           path: exitstatus/
 
   lint:
@@ -111,7 +111,7 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: exitstatus
+          name: exitstatus-${{ github.job }}
           path: exitstatus/
 
 
@@ -512,14 +512,15 @@ jobs:
         if: always()
         uses: actions/download-artifact@v4
         with:
-          name: exitstatus
           path: exitstatus/
+          pattern: exitstatus-*
+          merge-multiple: true
 
       - name: Delete Exit Status Artifacts
         if: always()
         uses: geekyeggo/delete-artifact@v5
         with:
-          name: exitstatus
+          pattern: exitstatus-*
           failOnError: false
 
       - name: Set Pipeline Exit Status

diff --git a/.github/workflows/templates/ci-tail.yml b/.github/workflows/templates/ci-tail.yml
@@ -13,14 +13,15 @@
         if: always()
         uses: actions/download-artifact@v4
         with:
-          name: exitstatus
           path: exitstatus/
+          pattern: exitstatus-*
+          merge-multiple: true
 
       - name: Delete Exit Status Artifacts
         if: always()
         uses: geekyeggo/delete-artifact@v5
         with:
-          name: exitstatus
+          pattern: exitstatus-*
           failOnError: false
 
       - name: Set Pipeline Exit Status

diff --git a/.github/workflows/templates/ci.yml b/.github/workflows/templates/ci.yml
@@ -49,7 +49,7 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: exitstatus
+          name: exitstatus-${{ github.job }}
           path: exitstatus/
 
   generate-actions-workflow:
@@ -86,7 +86,7 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: exitstatus
+          name: exitstatus-${{ github.job }}
           path: exitstatus/
 
   lint:
@@ -111,5 +111,5 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: exitstatus
+          name: exitstatus-${{ github.job }}
           path: exitstatus/
diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml
@@ -81,5 +81,5 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: exitstatus
+          name: exitstatus-${{ github.job }}-${{ matrix.instance }}-${{ inputs.distro-slug }}
           path: exitstatus/
diff --git a/.github/workflows/test-macos.yml b/.github/workflows/test-macos.yml
@@ -88,5 +88,5 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: exitstatus
+          name: exitstatus-${{ github.job }}-${{ matrix.instance }}-${{ inputs.distro-slug }}
           path: exitstatus/
diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml
@@ -117,5 +117,5 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: exitstatus
+          name: exitstatus-${{ github.job }}-${{ matrix.instance }}-${{ inputs.distro-slug }}
           path: exitstatus/