Testing previous version 4.3.6 instead of latest 4.4.0 for action/upl…

…oad-artifact/merge
dmurphy18 · Sep 6, 2024 · 5ff66f0 · 5ff66f0
1 parent a10a2f1
commit 5ff66f0
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 15 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -2027,7 +2027,8 @@ jobs:
 
       - name: Merge All Code Coverage Test Run Artifacts
         continue-on-error: true
-        uses: actions/upload-artifact/merge@v4
+        ## DGM uses: actions/upload-artifact/merge@v4
+        uses: actions/upload-artifact/merge@v4.3.6
         with:
           name: all-testrun-coverage-artifacts
           pattern: all-testrun-coverage-artifacts-*

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -2089,7 +2089,8 @@ jobs:
 
       - name: Merge All Code Coverage Test Run Artifacts
         continue-on-error: true
-        uses: actions/upload-artifact/merge@v4
+        ## DGM uses: actions/upload-artifact/merge@v4
+        uses: actions/upload-artifact/merge@v4.3.6
         with:
           name: all-testrun-coverage-artifacts
           pattern: all-testrun-coverage-artifacts-*

diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml
@@ -2066,7 +2066,8 @@ jobs:
 
       - name: Merge All Code Coverage Test Run Artifacts
         continue-on-error: true
-        uses: actions/upload-artifact/merge@v4
+        ## DGM uses: actions/upload-artifact/merge@v4
+        uses: actions/upload-artifact/merge@v4.3.6
         with:
           name: all-testrun-coverage-artifacts
           pattern: all-testrun-coverage-artifacts-*

diff --git a/.github/workflows/templates/ci.yml.jinja b/.github/workflows/templates/ci.yml.jinja
@@ -346,7 +346,8 @@
 
       - name: Merge All Code Coverage Test Run Artifacts
         continue-on-error: true
-        uses: actions/upload-artifact/merge@v4
+        ## DGM uses: actions/upload-artifact/merge@v4
+        uses: actions/upload-artifact/merge@v4.3.6
         with:
           name: all-testrun-coverage-artifacts
           pattern: all-testrun-coverage-artifacts-*

diff --git a/.github/workflows/test-action-linux.yml b/.github/workflows/test-action-linux.yml
@@ -328,7 +328,8 @@ jobs:
       - name: Merge JUnit XML Test Run Artifacts
         if: always() && needs.test.result != 'cancelled' && needs.test.result != 'skipped'
         continue-on-error: true
-        uses: actions/upload-artifact/merge@v4
+        ## DGM uses: actions/upload-artifact/merge@v4
+        uses: actions/upload-artifact/merge@v4.3.6
         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 }}-*
@@ -338,7 +339,8 @@ jobs:
       - name: Merge Log Test Run Artifacts
         if: always() && needs.test.result != 'cancelled' && needs.test.result != 'skipped'
         continue-on-error: true
-        uses: actions/upload-artifact/merge@v4
+        ## DGM uses: actions/upload-artifact/merge@v4
+        uses: actions/upload-artifact/merge@v4.3.6
         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 }}-*
@@ -348,7 +350,8 @@ jobs:
       - name: Merge Code Coverage Test Run Artifacts
         if: ${{ inputs.skip-code-coverage == false }}
         continue-on-error: true
-        uses: actions/upload-artifact/merge@v4
+        ## DGM uses: actions/upload-artifact/merge@v4
+        uses: actions/upload-artifact/merge@v4.3.6
         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 }}-*

diff --git a/.github/workflows/test-action-macos.yml b/.github/workflows/test-action-macos.yml
@@ -358,7 +358,8 @@ jobs:
       - name: Merge JUnit XML Test Run Artifacts
         if: always() && needs.test.result != 'cancelled' && needs.test.result != 'skipped'
         continue-on-error: true
-        uses: actions/upload-artifact/merge@v4
+        ## DGM uses: actions/upload-artifact/merge@v4
+        uses: actions/upload-artifact/merge@v4.3.6
         with:
           name: testrun-junit-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}
           pattern: testrun-junit-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-*
@@ -368,7 +369,8 @@ jobs:
       - name: Merge Log Test Run Artifacts
         if: always() && needs.test.result != 'cancelled' && needs.test.result != 'skipped'
         continue-on-error: true
-        uses: actions/upload-artifact/merge@v4
+        ## DGM uses: actions/upload-artifact/merge@v4
+        uses: actions/upload-artifact/merge@v4.3.6
         with:
           name: testrun-log-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}
           pattern: testrun-log-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-*
@@ -378,7 +380,8 @@ jobs:
       - name: Merge Code Coverage Test Run Artifacts
         if: ${{ inputs.skip-code-coverage == false }}
         continue-on-error: true
-        uses: actions/upload-artifact/merge@v4
+        ## DGM uses: actions/upload-artifact/merge@v4
+        uses: actions/upload-artifact/merge@v4.3.6
         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
@@ -329,7 +329,8 @@ jobs:
       - name: Merge JUnit XML Test Run Artifacts
         if: always() && needs.test.result != 'cancelled' && needs.test.result != 'skipped'
         continue-on-error: true
-        uses: actions/upload-artifact/merge@v4
+        ## DGM uses: actions/upload-artifact/merge@v4
+        uses: actions/upload-artifact/merge@v4.3.6
         with:
           name: testrun-junit-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}
           pattern: testrun-junit-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-*
@@ -339,7 +340,8 @@ jobs:
       - name: Merge Log Test Run Artifacts
         if: always() && needs.test.result != 'cancelled' && needs.test.result != 'skipped'
         continue-on-error: true
-        uses: actions/upload-artifact/merge@v4
+        ## DGM uses: actions/upload-artifact/merge@v4
+        uses: actions/upload-artifact/merge@v4.3.6
         with:
           name: testrun-log-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}
           pattern: testrun-log-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-*
@@ -349,7 +351,8 @@ jobs:
       - name: Merge Code Coverage Test Run Artifacts
         if: ${{ inputs.skip-code-coverage == false }}
         continue-on-error: true
-        uses: actions/upload-artifact/merge@v4
+        ## DGM uses: actions/upload-artifact/merge@v4
+        uses: actions/upload-artifact/merge@v4.3.6
         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-macos.yml b/.github/workflows/test-packages-action-macos.yml
@@ -239,7 +239,8 @@ jobs:
 
       - name: Merge Test Run Artifacts
         continue-on-error: true
-        uses: actions/upload-artifact/merge@v4
+        ## DGM uses: actions/upload-artifact/merge@v4
+        uses: actions/upload-artifact/merge@v4.3.6
         with:
           name: pkg-testrun-artifacts-${{ inputs.distro-slug }}-${{ inputs.pkg-type }}
           pattern: pkg-testrun-artifacts-${{ inputs.distro-slug }}-${{ inputs.pkg-type }}-*

diff --git a/.github/workflows/test-packages-action-windows.yml b/.github/workflows/test-packages-action-windows.yml
@@ -246,7 +246,8 @@ jobs:
           t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t"
 
       - name: Merge Test Run Artifacts
-        uses: actions/upload-artifact/merge@v4
+        ## DGM uses: actions/upload-artifact/merge@v4
+        uses: actions/upload-artifact/merge@v4.3.6
         continue-on-error: true
         with:
           name: pkg-testrun-artifacts-${{ inputs.distro-slug }}-${{ inputs.pkg-type }}