Revert to using v4 and alter pattern (leave off dash)

saltstack · Sep 9, 2024 · 9f10d73 · 9f10d73
1 parent 063761d
commit 9f10d73
Show file tree

Hide file tree

Showing 9 changed files with 58 additions and 44 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -2027,11 +2027,12 @@ jobs:
 
       - name: Merge All Code Coverage Test Run Artifacts
         continue-on-error: true
-        ## DGM uses: actions/upload-artifact/merge@v4
-        uses: actions/upload-artifact/[email protected]
+        uses: actions/upload-artifact/merge@v4
+        ## DGM uses: actions/upload-artifact/[email protected]
         with:
           name: all-testrun-coverage-artifacts
-          pattern: all-testrun-coverage-artifacts-*
+          ## DGM 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
@@ -2089,11 +2089,12 @@ jobs:
 
       - name: Merge All Code Coverage Test Run Artifacts
         continue-on-error: true
-        ## DGM uses: actions/upload-artifact/merge@v4
-        uses: actions/upload-artifact/[email protected]
+        uses: actions/upload-artifact/merge@v4
+        ## DGM uses: actions/upload-artifact/[email protected]
         with:
           name: all-testrun-coverage-artifacts
-          pattern: all-testrun-coverage-artifacts-*
+          ## DGM 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
@@ -2066,11 +2066,12 @@ jobs:
 
       - name: Merge All Code Coverage Test Run Artifacts
         continue-on-error: true
-        ## DGM uses: actions/upload-artifact/merge@v4
-        uses: actions/upload-artifact/[email protected]
+        uses: actions/upload-artifact/merge@v4
+        ## DGM uses: actions/upload-artifact/[email protected]
         with:
           name: all-testrun-coverage-artifacts
-          pattern: all-testrun-coverage-artifacts-*
+          ## DGM 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
@@ -346,11 +346,12 @@
 
       - name: Merge All Code Coverage Test Run Artifacts
         continue-on-error: true
-        ## DGM uses: actions/upload-artifact/merge@v4
-        uses: actions/upload-artifact/[email protected]
+        uses: actions/upload-artifact/merge@v4
+        ## DGM uses: actions/upload-artifact/[email protected]
         with:
           name: all-testrun-coverage-artifacts
-          pattern: all-testrun-coverage-artifacts-*
+          ## DGM 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
@@ -328,33 +328,36 @@ jobs:
       - name: Merge JUnit XML Test Run Artifacts
         if: always() && needs.test.result != 'cancelled' && needs.test.result != 'skipped'
         continue-on-error: true
-        ## DGM uses: actions/upload-artifact/merge@v4
-        uses: actions/upload-artifact/[email protected]
+        uses: actions/upload-artifact/merge@v4
+        ## DGM uses: actions/upload-artifact/[email protected]
         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 }}-*
+          ## DGM 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
         if: always() && needs.test.result != 'cancelled' && needs.test.result != 'skipped'
         continue-on-error: true
-        ## DGM uses: actions/upload-artifact/merge@v4
-        uses: actions/upload-artifact/[email protected]
+        uses: actions/upload-artifact/merge@v4
+        ## DGM uses: actions/upload-artifact/[email protected]
         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 }}-*
+          ## DGM 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
         if: ${{ inputs.skip-code-coverage == false }}
         continue-on-error: true
-        ## DGM uses: actions/upload-artifact/merge@v4
-        uses: actions/upload-artifact/[email protected]
+        uses: actions/upload-artifact/merge@v4
+        ## DGM uses: actions/upload-artifact/[email protected]
         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 }}-*
+          ## DGM 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
@@ -358,8 +358,8 @@ jobs:
       - name: Merge JUnit XML Test Run Artifacts
         if: always() && needs.test.result != 'cancelled' && needs.test.result != 'skipped'
         continue-on-error: true
-        ## DGM uses: actions/upload-artifact/merge@v4
-        uses: actions/upload-artifact/[email protected]
+        uses: actions/upload-artifact/merge@v4
+        ## DGM uses: actions/upload-artifact/[email protected]
         with:
           name: testrun-junit-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}
           pattern: testrun-junit-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-*
@@ -369,22 +369,24 @@ jobs:
       - name: Merge Log Test Run Artifacts
         if: always() && needs.test.result != 'cancelled' && needs.test.result != 'skipped'
         continue-on-error: true
-        ## DGM uses: actions/upload-artifact/merge@v4
-        uses: actions/upload-artifact/[email protected]
+        uses: actions/upload-artifact/merge@v4
+        ## DGM uses: actions/upload-artifact/[email protected]
         with:
           name: testrun-log-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}
-          pattern: testrun-log-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-*
+          ## DGM pattern: 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
         if: ${{ inputs.skip-code-coverage == false }}
         continue-on-error: true
-        ## DGM uses: actions/upload-artifact/merge@v4
-        uses: actions/upload-artifact/[email protected]
+        uses: actions/upload-artifact/merge@v4
+        ## DGM uses: actions/upload-artifact/[email protected]
         with:
           name: testrun-coverage-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}
-          pattern: testrun-coverage-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-*
+          ## DGM pattern: testrun-coverage-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-*
+          pattern: testrun-coverage-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}*
           separate-directories: false
           delete-merged: true
 

diff --git a/.github/workflows/test-action-windows.yml b/.github/workflows/test-action-windows.yml
@@ -329,33 +329,36 @@ jobs:
       - name: Merge JUnit XML Test Run Artifacts
         if: always() && needs.test.result != 'cancelled' && needs.test.result != 'skipped'
         continue-on-error: true
-        ## DGM uses: actions/upload-artifact/merge@v4
-        uses: actions/upload-artifact/[email protected]
+        uses: actions/upload-artifact/merge@v4
+        ## DGM uses: actions/upload-artifact/[email protected]
         with:
           name: testrun-junit-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}
-          pattern: testrun-junit-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-*
+          ## DGM pattern: 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
         if: always() && needs.test.result != 'cancelled' && needs.test.result != 'skipped'
         continue-on-error: true
-        ## DGM uses: actions/upload-artifact/merge@v4
-        uses: actions/upload-artifact/[email protected]
+        uses: actions/upload-artifact/merge@v4
+        ## DGM uses: actions/upload-artifact/[email protected]
         with:
           name: testrun-log-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}
-          pattern: testrun-log-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-*
+          ## DGM pattern: 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
         if: ${{ inputs.skip-code-coverage == false }}
         continue-on-error: true
-        ## DGM uses: actions/upload-artifact/merge@v4
-        uses: actions/upload-artifact/[email protected]
+        uses: actions/upload-artifact/merge@v4
+        ## DGM uses: actions/upload-artifact/[email protected]
         with:
           name: testrun-coverage-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}
-          pattern: testrun-coverage-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-*
+          ## DGM pattern: testrun-coverage-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-*
+          pattern: testrun-coverage-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}*
           separate-directories: false
           delete-merged: true
 

diff --git a/.github/workflows/test-packages-action-macos.yml b/.github/workflows/test-packages-action-macos.yml
@@ -239,11 +239,12 @@ jobs:
 
       - name: Merge Test Run Artifacts
         continue-on-error: true
-        ## DGM uses: actions/upload-artifact/merge@v4
-        uses: actions/upload-artifact/[email protected]
+        uses: actions/upload-artifact/merge@v4
+        ## DGM uses: actions/upload-artifact/[email protected]
         with:
           name: pkg-testrun-artifacts-${{ inputs.distro-slug }}-${{ inputs.pkg-type }}
-          pattern: pkg-testrun-artifacts-${{ inputs.distro-slug }}-${{ inputs.pkg-type }}-*
+          ## DGM 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
@@ -246,12 +246,13 @@ jobs:
           t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t"
 
       - name: Merge Test Run Artifacts
-        ## DGM uses: actions/upload-artifact/merge@v4
-        uses: actions/upload-artifact/[email protected]
+        uses: actions/upload-artifact/merge@v4
+        ## DGM uses: actions/upload-artifact/[email protected]
         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 }}-*
+          ## DGM 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