From 7cb55c9092be9f4aa05cccb3de5fec5fd982c656 Mon Sep 17 00:00:00 2001 From: David Murphy Date: Tue, 10 Sep 2024 14:45:22 -0600 Subject: [PATCH] removing commented out 4.3.6, and added debugging --- .github/workflows/ci.yml | 4 +--- .github/workflows/nightly.yml | 4 +--- .github/workflows/scheduled.yml | 4 +--- .github/workflows/templates/ci.yml.jinja | 4 +--- .github/workflows/test-action-linux.yml | 5 ++--- .github/workflows/test-action-macos.yml | 3 --- .github/workflows/test-action-windows.yml | 3 --- .github/workflows/test-packages-action-macos.yml | 1 - .github/workflows/test-packages-action-windows.yml | 1 - 9 files changed, 6 insertions(+), 23 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 711fbe402ce2..207699290786 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2028,11 +2028,9 @@ 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.3.6 with: name: all-testrun-coverage-artifacts - ## DGM pattern: 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 index 15f6210702e8..93c4c09f55e8 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -2090,11 +2090,9 @@ 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.3.6 with: name: all-testrun-coverage-artifacts - ## DGM pattern: 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 index 8dd3b13eb306..2ab7dc11b6d1 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -2067,11 +2067,9 @@ 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.3.6 with: name: all-testrun-coverage-artifacts - ## DGM pattern: 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 index f248c06037c0..eef2e77ba846 100644 --- a/.github/workflows/templates/ci.yml.jinja +++ b/.github/workflows/templates/ci.yml.jinja @@ -347,11 +347,9 @@ - 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.3.6 with: name: all-testrun-coverage-artifacts - ## DGM pattern: 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 index 28695ab91d90..d671aa26c90b 100644 --- a/.github/workflows/test-action-linux.yml +++ b/.github/workflows/test-action-linux.yml @@ -276,6 +276,8 @@ jobs: if [ "${{ inputs.skip-code-coverage }}" != "true" ]; then mv artifacts/coverage/.coverage artifacts/coverage/.coverage.${{ inputs.distro-slug }}${{ inputs.fips && '.fips' || '' }}.${{ inputs.nox-session }}.${{ matrix.transport }}.${{ matrix.tests-chunk }}.grp${{ matrix.test-group || '1' }} fi + # DGM + tree -a artifacts - name: Destroy VM if: always() @@ -329,7 +331,6 @@ jobs: 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.3.6 with: name: 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 }}-* @@ -341,7 +342,6 @@ jobs: 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.3.6 with: name: 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 }}-* @@ -353,7 +353,6 @@ jobs: if: ${{ inputs.skip-code-coverage == false }} continue-on-error: true uses: actions/upload-artifact/merge@v4 - ## DGM uses: actions/upload-artifact/merge@v4.3.6 with: name: 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 }}-* diff --git a/.github/workflows/test-action-macos.yml b/.github/workflows/test-action-macos.yml index 7c1b04d3de7f..434256aa058f 100644 --- a/.github/workflows/test-action-macos.yml +++ b/.github/workflows/test-action-macos.yml @@ -359,7 +359,6 @@ jobs: 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.3.6 with: name: testrun-junit-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }} pattern: testrun-junit-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-* @@ -370,7 +369,6 @@ jobs: 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.3.6 with: name: testrun-log-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }} ## DGM pattern: testrun-log-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-* @@ -382,7 +380,6 @@ jobs: if: ${{ inputs.skip-code-coverage == false }} continue-on-error: true uses: actions/upload-artifact/merge@v4 - ## DGM uses: actions/upload-artifact/merge@v4.3.6 with: name: testrun-coverage-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }} ## DGM 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 index 2188d3707d99..a1ecbe2ef132 100644 --- a/.github/workflows/test-action-windows.yml +++ b/.github/workflows/test-action-windows.yml @@ -330,7 +330,6 @@ jobs: 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.3.6 with: name: testrun-junit-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }} ## DGM pattern: testrun-junit-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-* @@ -342,7 +341,6 @@ jobs: 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.3.6 with: name: testrun-log-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }} ## DGM pattern: testrun-log-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-* @@ -354,7 +352,6 @@ jobs: if: ${{ inputs.skip-code-coverage == false }} continue-on-error: true uses: actions/upload-artifact/merge@v4 - ## DGM uses: actions/upload-artifact/merge@v4.3.6 with: name: testrun-coverage-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }} ## DGM 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 index 4a147ae13d41..df3696cce17f 100644 --- a/.github/workflows/test-packages-action-macos.yml +++ b/.github/workflows/test-packages-action-macos.yml @@ -240,7 +240,6 @@ jobs: - name: Merge Test Run Artifacts continue-on-error: true uses: actions/upload-artifact/merge@v4 - ## DGM uses: actions/upload-artifact/merge@v4.3.6 with: name: pkg-testrun-artifacts-${{ inputs.distro-slug }}-${{ inputs.pkg-type }} ## DGM 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 index e6592b9fde8d..c91dc5973a3c 100644 --- a/.github/workflows/test-packages-action-windows.yml +++ b/.github/workflows/test-packages-action-windows.yml @@ -247,7 +247,6 @@ jobs: - name: Merge Test Run Artifacts uses: actions/upload-artifact/merge@v4 - ## DGM uses: actions/upload-artifact/merge@v4.3.6 continue-on-error: true with: name: pkg-testrun-artifacts-${{ inputs.distro-slug }}-${{ inputs.pkg-type }}