From ac09c433b34740a3e56752399010febd162d5845 Mon Sep 17 00:00:00 2001 From: David Murphy Date: Wed, 11 Sep 2024 13:26:09 -0600 Subject: [PATCH] Trying other debug methods --- .github/workflows/ci.yml | 3 ++- .github/workflows/nightly.yml | 3 ++- .github/workflows/scheduled.yml | 3 ++- .github/workflows/templates/ci.yml.jinja | 3 ++- .github/workflows/test-action-macos.yml | 5 ++++- .github/workflows/test-action-windows.yml | 2 ++ .github/workflows/test-packages-action-linux.yml | 3 ++- 7 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4e88f05b4a2..392d1329431 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2019,7 +2019,8 @@ jobs: uses: actions/upload-artifact/merge@v4 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 index d7bb4973001..5033f37a794 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -2081,7 +2081,8 @@ jobs: uses: actions/upload-artifact/merge@v4 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 index 86e57fb71a4..6fd4c1b15ee 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -2058,7 +2058,8 @@ jobs: uses: actions/upload-artifact/merge@v4 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 index 91713863f18..a035888a243 100644 --- a/.github/workflows/templates/ci.yml.jinja +++ b/.github/workflows/templates/ci.yml.jinja @@ -362,7 +362,8 @@ uses: actions/upload-artifact/merge@v4 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-macos.yml b/.github/workflows/test-action-macos.yml index 434256aa058..a65dc59118b 100644 --- a/.github/workflows/test-action-macos.yml +++ b/.github/workflows/test-action-macos.yml @@ -319,6 +319,8 @@ jobs: name: testrun-coverage-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-${{ matrix.transport }}-${{ matrix.tests-chunk }}-${{ env.TIMESTAMP }} path: | artifacts/coverage/ + # DGM + include-hidden-files: true - name: Upload JUnit XML Test Run Artifacts if: always() && steps.download-artifacts-from-vm.outcome == 'success' @@ -361,7 +363,8 @@ 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 }}-* + ## 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 diff --git a/.github/workflows/test-action-windows.yml b/.github/workflows/test-action-windows.yml index a1ecbe2ef13..192f73a1b5c 100644 --- a/.github/workflows/test-action-windows.yml +++ b/.github/workflows/test-action-windows.yml @@ -289,6 +289,8 @@ jobs: name: testrun-coverage-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-${{ matrix.transport }}-${{ matrix.tests-chunk }}-grp${{ matrix.test-group || '1' }}-${{ env.TIMESTAMP }} path: | artifacts/coverage/ + # DGM + include-hidden-files: true - name: Upload JUnit XML Test Run Artifacts if: always() && steps.download-artifacts-from-vm.outcome == 'success' diff --git a/.github/workflows/test-packages-action-linux.yml b/.github/workflows/test-packages-action-linux.yml index 36b4d7818d4..dfde25f5186 100644 --- a/.github/workflows/test-packages-action-linux.yml +++ b/.github/workflows/test-packages-action-linux.yml @@ -251,7 +251,8 @@ jobs: 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 }}-* + ## DGM 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