Merge 3006.x into 3007.x

s0undt3ch · May 23, 2024 · 545ae5e · 545ae5e
2 parents 55f9962 + 2e93352
commit 545ae5e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/test-action-macos.yml b/.github/workflows/test-action-macos.yml
@@ -351,7 +351,7 @@ jobs:
         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 }}*
+          pattern: testrun-junit-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
@@ -324,7 +324,7 @@ jobs:
         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 }}*
+          pattern: testrun-junit-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-*
           separate-directories: false
           delete-merged: true