Yet some more artifact merging fixes

saltstack · May 19, 2024 · df1061c · df1061c
1 parent 148e63e
commit df1061c
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 26 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -2088,11 +2088,11 @@ jobs:
 
 
       - name: Merge All Code Coverage Test Run Artifacts
+        continue-on-error: true
         uses: actions/upload-artifact/merge@v4
-        id: merge-coverage-artifacts
         with:
           name: all-testrun-coverage-artifacts
-          pattern: all-testrun-coverage-artifacts*
+          pattern: all-testrun-coverage-artifacts-*
           separate-directories: false
           delete-merged: true
 

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -2153,11 +2153,11 @@ jobs:
 
 
       - name: Merge All Code Coverage Test Run Artifacts
+        continue-on-error: true
         uses: actions/upload-artifact/merge@v4
-        id: merge-coverage-artifacts
         with:
           name: all-testrun-coverage-artifacts
-          pattern: all-testrun-coverage-artifacts*
+          pattern: all-testrun-coverage-artifacts-*
           separate-directories: false
           delete-merged: true
 

diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml
@@ -2135,11 +2135,11 @@ jobs:
 
 
       - name: Merge All Code Coverage Test Run Artifacts
+        continue-on-error: true
         uses: actions/upload-artifact/merge@v4
-        id: merge-coverage-artifacts
         with:
           name: all-testrun-coverage-artifacts
-          pattern: all-testrun-coverage-artifacts*
+          pattern: all-testrun-coverage-artifacts-*
           separate-directories: false
           delete-merged: true
 

diff --git a/.github/workflows/templates/ci.yml.jinja b/.github/workflows/templates/ci.yml.jinja
@@ -348,11 +348,11 @@
 #}
 
       - name: Merge All Code Coverage Test Run Artifacts
+        continue-on-error: true
         uses: actions/upload-artifact/merge@v4
-        id: merge-coverage-artifacts
         with:
           name: all-testrun-coverage-artifacts
-          pattern: all-testrun-coverage-artifacts*
+          pattern: all-testrun-coverage-artifacts-*
           separate-directories: false
           delete-merged: true
 

diff --git a/.github/workflows/test-action-linux.yml b/.github/workflows/test-action-linux.yml
@@ -318,30 +318,32 @@ jobs:
           t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t"
 
       - name: Merge JUnit XML Test Run Artifacts
-        uses: actions/upload-artifact/merge@v4
         if: always() && needs.test.result != 'cancelled' && needs.test.result != 'skipped'
+        continue-on-error: true
+        uses: actions/upload-artifact/merge@v4
         with:
           name: testrun-junit-artifacts-${{ inputs.distro-slug }}${{ inputs.fips && '-fips' || '' }}-${{ inputs.nox-session }}
-          pattern: testrun-junit-artifacts-${{ inputs.distro-slug }}${{ inputs.fips && '-fips' || '' }}-${{ inputs.nox-session }}*
+          pattern: testrun-junit-artifacts-${{ inputs.distro-slug }}${{ inputs.fips && '-fips' || '' }}-${{ inputs.nox-session }}-*
           separate-directories: false
           delete-merged: true
 
       - name: Merge Log Test Run Artifacts
-        uses: actions/upload-artifact/merge@v4
         if: always() && needs.test.result != 'cancelled' && needs.test.result != 'skipped'
+        continue-on-error: true
+        uses: actions/upload-artifact/merge@v4
         with:
           name: testrun-log-artifacts-${{ inputs.distro-slug }}${{ inputs.fips && '-fips' || '' }}-${{ inputs.nox-session }}
-          pattern: testrun-log-artifacts-${{ inputs.distro-slug }}${{ inputs.fips && '-fips' || '' }}-${{ inputs.nox-session }}*
+          pattern: testrun-log-artifacts-${{ inputs.distro-slug }}${{ inputs.fips && '-fips' || '' }}-${{ inputs.nox-session }}-*
           separate-directories: false
           delete-merged: true
 
       - name: Merge Code Coverage Test Run Artifacts
-        uses: actions/upload-artifact/merge@v4
         if: ${{ inputs.skip-code-coverage == false }}
-        id: merge-coverage-artifacts
+        continue-on-error: true
+        uses: actions/upload-artifact/merge@v4
         with:
           name: testrun-coverage-artifacts-${{ inputs.distro-slug }}${{ inputs.fips && '-fips' || '' }}-${{ inputs.nox-session }}
-          pattern: testrun-coverage-artifacts-${{ inputs.distro-slug }}${{ inputs.fips && '-fips' || '' }}-${{ inputs.nox-session }}*
+          pattern: testrun-coverage-artifacts-${{ inputs.distro-slug }}${{ inputs.fips && '-fips' || '' }}-${{ inputs.nox-session }}-*
           separate-directories: false
           delete-merged: true
 

diff --git a/.github/workflows/test-action-macos.yml b/.github/workflows/test-action-macos.yml
@@ -346,27 +346,29 @@ jobs:
           t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t"
 
       - name: Merge JUnit XML Test Run Artifacts
-        uses: actions/upload-artifact/merge@v4
         if: always() && needs.test.result != 'cancelled' && needs.test.result != 'skipped'
+        continue-on-error: true
+        uses: actions/upload-artifact/merge@v4
         with:
           name: testrun-junit-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}
           pattern: testrun-junit-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}*
           separate-directories: false
           delete-merged: true
 
       - name: Merge Log Test Run Artifacts
-        uses: actions/upload-artifact/merge@v4
         if: always() && needs.test.result != 'cancelled' && needs.test.result != 'skipped'
+        continue-on-error: true
+        uses: actions/upload-artifact/merge@v4
         with:
           name: testrun-log-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}
           pattern: testrun-log-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}*
           separate-directories: false
           delete-merged: true
 
       - name: Merge Code Coverage Test Run Artifacts
-        uses: actions/upload-artifact/merge@v4
         if: ${{ inputs.skip-code-coverage == false }}
-        id: merge-coverage-artifacts
+        continue-on-error: true
+        uses: actions/upload-artifact/merge@v4
         with:
           name: testrun-coverage-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}
           pattern: testrun-coverage-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}*

diff --git a/.github/workflows/test-action-windows.yml b/.github/workflows/test-action-windows.yml
@@ -319,27 +319,29 @@ jobs:
           t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t"
 
       - name: Merge JUnit XML Test Run Artifacts
-        uses: actions/upload-artifact/merge@v4
         if: always() && needs.test.result != 'cancelled' && needs.test.result != 'skipped'
+        continue-on-error: true
+        uses: actions/upload-artifact/merge@v4
         with:
           name: testrun-junit-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}
           pattern: testrun-junit-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}*
           separate-directories: false
           delete-merged: true
 
       - name: Merge Log Test Run Artifacts
-        uses: actions/upload-artifact/merge@v4
         if: always() && needs.test.result != 'cancelled' && needs.test.result != 'skipped'
+        continue-on-error: true
+        uses: actions/upload-artifact/merge@v4
         with:
           name: testrun-log-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}
           pattern: testrun-log-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}*
           separate-directories: false
           delete-merged: true
 
       - name: Merge Code Coverage Test Run Artifacts
-        uses: actions/upload-artifact/merge@v4
         if: ${{ inputs.skip-code-coverage == false }}
-        id: merge-coverage-artifacts
+        continue-on-error: true
+        uses: actions/upload-artifact/merge@v4
         with:
           name: testrun-coverage-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}
           pattern: testrun-coverage-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}*

diff --git a/.github/workflows/test-packages-action-linux.yml b/.github/workflows/test-packages-action-linux.yml
@@ -252,10 +252,11 @@ jobs:
           t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t"
 
       - name: Merge Test Run Artifacts
+        continue-on-error: true
         uses: actions/upload-artifact/merge@v4
         with:
           name: pkg-testrun-artifacts-${{ inputs.distro-slug }}${{ inputs.fips && '-fips' || '' }}-${{ inputs.pkg-type }}
-          pattern: pkg-testrun-artifacts-${{ inputs.distro-slug }}${{ inputs.fips && '-fips' || '' }}-${{ inputs.pkg-type }}*
+          pattern: pkg-testrun-artifacts-${{ inputs.distro-slug }}${{ inputs.fips && '-fips' || '' }}-${{ inputs.pkg-type }}-*
           separate-directories: true
           delete-merged: true
 

diff --git a/.github/workflows/test-packages-action-macos.yml b/.github/workflows/test-packages-action-macos.yml
@@ -235,10 +235,11 @@ jobs:
           t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t"
 
       - name: Merge Test Run Artifacts
+        continue-on-error: true
         uses: actions/upload-artifact/merge@v4
         with:
           name: pkg-testrun-artifacts-${{ inputs.distro-slug }}-${{ inputs.pkg-type }}
-          pattern: pkg-testrun-artifacts-${{ inputs.distro-slug }}-${{ inputs.pkg-type }}*
+          pattern: pkg-testrun-artifacts-${{ inputs.distro-slug }}-${{ inputs.pkg-type }}-*
           separate-directories: true
           delete-merged: true
 

diff --git a/.github/workflows/test-packages-action-windows.yml b/.github/workflows/test-packages-action-windows.yml
@@ -252,9 +252,10 @@ jobs:
 
       - name: Merge Test Run Artifacts
         uses: actions/upload-artifact/merge@v4
+        continue-on-error: true
         with:
           name: pkg-testrun-artifacts-${{ inputs.distro-slug }}-${{ inputs.pkg-type }}
-          pattern: pkg-testrun-artifacts-${{ inputs.distro-slug }}-${{ inputs.pkg-type }}*
+          pattern: pkg-testrun-artifacts-${{ inputs.distro-slug }}-${{ inputs.pkg-type }}-*
           separate-directories: true
           delete-merged: true