From a6fff58e4a8f80987c0de8b9427c3ad4f12e026f Mon Sep 17 00:00:00 2001 From: David Murphy Date: Mon, 16 Sep 2024 16:58:34 -0600 Subject: [PATCH] Remove comments --- .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-linux.yml | 20 +++---------------- .github/workflows/test-action-macos.yml | 18 +++-------------- .github/workflows/test-action-windows.yml | 18 +++-------------- .../workflows/test-packages-action-linux.yml | 3 +-- .../workflows/test-packages-action-macos.yml | 3 +-- .../test-packages-action-windows.yml | 3 +-- 10 files changed, 16 insertions(+), 61 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 392d1329431..4e88f05b4a2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2019,8 +2019,7 @@ jobs: uses: actions/upload-artifact/merge@v4 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 5033f37a794..d7bb4973001 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -2081,8 +2081,7 @@ jobs: uses: actions/upload-artifact/merge@v4 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 6fd4c1b15ee..86e57fb71a4 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -2058,8 +2058,7 @@ jobs: uses: actions/upload-artifact/merge@v4 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 a035888a243..91713863f18 100644 --- a/.github/workflows/templates/ci.yml.jinja +++ b/.github/workflows/templates/ci.yml.jinja @@ -362,8 +362,7 @@ uses: actions/upload-artifact/merge@v4 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 6f1b2458b92..83f99a0b66d 100644 --- a/.github/workflows/test-action-linux.yml +++ b/.github/workflows/test-action-linux.yml @@ -276,8 +276,6 @@ 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() @@ -291,7 +289,6 @@ jobs: name: testrun-coverage-artifacts-${{ inputs.distro-slug }}${{ inputs.fips && '-fips' || '' }}-${{ 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 @@ -335,8 +332,7 @@ jobs: uses: actions/upload-artifact/merge@v4 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 }}-* - 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 @@ -346,8 +342,7 @@ jobs: uses: actions/upload-artifact/merge@v4 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 }}-* - 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 @@ -357,28 +352,19 @@ jobs: uses: actions/upload-artifact/merge@v4 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 }}-* - 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 - # DGM - ## DGM delete this test # overwrite: true - name: Download Code Coverage Test Run Artifacts uses: actions/download-artifact@v4 if: ${{ inputs.skip-code-coverage == false }} id: download-coverage-artifacts with: - ## DGM name: testrun-coverage-artifacts-${{ inputs.distro-slug }}${{ inputs.fips && '-fips' || '' }}-${{ inputs.nox-session }} path: artifacts/coverage/ pattern: testrun-coverage-artifacts-${{ inputs.distro-slug }}${{ inputs.fips && '-fips' || '' }}-${{ inputs.nox-session }}* merge-multiple: true - # DGM - - name: DGM Show Downloaded Test Run Artifacts - run: | - tree -a artifacts - - name: Show Downloaded Test Run Artifacts if: ${{ inputs.skip-code-coverage == false }} run: | diff --git a/.github/workflows/test-action-macos.yml b/.github/workflows/test-action-macos.yml index a7217f27084..a3f0e75a743 100644 --- a/.github/workflows/test-action-macos.yml +++ b/.github/workflows/test-action-macos.yml @@ -311,8 +311,6 @@ jobs: if [ "${{ inputs.skip-code-coverage }}" != "true" ]; then mv artifacts/coverage/.coverage artifacts/coverage/.coverage.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.${{ matrix.transport }}.${{ matrix.tests-chunk }} fi - # DGM - tree -a artifacts - name: Upload Code Coverage Test Run Artifacts if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' @@ -321,7 +319,6 @@ 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 @@ -365,8 +362,7 @@ jobs: uses: actions/upload-artifact/merge@v4 with: name: 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 }}* + pattern: testrun-junit-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-* separate-directories: false delete-merged: true @@ -376,8 +372,7 @@ jobs: uses: actions/upload-artifact/merge@v4 with: name: 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 }}* + pattern: testrun-log-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-* separate-directories: false delete-merged: true @@ -387,8 +382,7 @@ jobs: uses: actions/upload-artifact/merge@v4 with: name: 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 }}* + pattern: testrun-coverage-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-* separate-directories: false delete-merged: true @@ -397,16 +391,10 @@ jobs: if: ${{ inputs.skip-code-coverage == false }} id: download-coverage-artifacts with: - ## DGM name: testrun-coverage-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }} path: artifacts/coverage/ pattern: testrun-coverage-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}* merge-multiple: true - # DGM - - name: DGM Show Downloaded Test Run Artifacts - run: | - tree -a artifacts - - name: Show Downloaded Test Run Artifacts if: ${{ inputs.skip-code-coverage == false }} run: | diff --git a/.github/workflows/test-action-windows.yml b/.github/workflows/test-action-windows.yml index 7ee1aa17c48..e8944451b07 100644 --- a/.github/workflows/test-action-windows.yml +++ b/.github/workflows/test-action-windows.yml @@ -276,8 +276,6 @@ jobs: if [ "${{ inputs.skip-code-coverage }}" != "true" ]; then mv artifacts/coverage/.coverage artifacts/coverage/.coverage.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.${{ matrix.transport }}.${{ matrix.tests-chunk }}.grp${{ matrix.test-group || '1' }} fi - # DGM - tree -a artifacts - name: Destroy VM if: always() @@ -291,7 +289,6 @@ 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 @@ -336,8 +333,7 @@ jobs: uses: actions/upload-artifact/merge@v4 with: name: 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 }}* + pattern: testrun-junit-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-* separate-directories: false delete-merged: true @@ -347,8 +343,7 @@ jobs: uses: actions/upload-artifact/merge@v4 with: name: 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 }}* + pattern: testrun-log-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-* separate-directories: false delete-merged: true @@ -358,8 +353,7 @@ jobs: uses: actions/upload-artifact/merge@v4 with: name: 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 }}* + pattern: testrun-coverage-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-* separate-directories: false delete-merged: true @@ -368,16 +362,10 @@ jobs: if: ${{ inputs.skip-code-coverage == false }} id: download-coverage-artifacts with: - ## DGM name: testrun-coverage-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }} path: artifacts/coverage/ pattern: testrun-coverage-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}* merge-multiple: true - # DGM - - name: DGM Show Downloaded Test Run Artifacts - run: | - tree -a artifacts - - name: Show Downloaded Test Run Artifacts if: ${{ inputs.skip-code-coverage == false }} run: | diff --git a/.github/workflows/test-packages-action-linux.yml b/.github/workflows/test-packages-action-linux.yml index dfde25f5186..36b4d7818d4 100644 --- a/.github/workflows/test-packages-action-linux.yml +++ b/.github/workflows/test-packages-action-linux.yml @@ -251,8 +251,7 @@ jobs: uses: actions/upload-artifact/merge@v4 with: name: 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 }}* + pattern: pkg-testrun-artifacts-${{ inputs.distro-slug }}${{ inputs.fips && '-fips' || '' }}-${{ inputs.pkg-type }}-* separate-directories: true delete-merged: true diff --git a/.github/workflows/test-packages-action-macos.yml b/.github/workflows/test-packages-action-macos.yml index df3696cce17..aca0b4cc244 100644 --- a/.github/workflows/test-packages-action-macos.yml +++ b/.github/workflows/test-packages-action-macos.yml @@ -242,8 +242,7 @@ jobs: uses: actions/upload-artifact/merge@v4 with: name: 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 }}* + 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 index c91dc5973a3..985ff96de82 100644 --- a/.github/workflows/test-packages-action-windows.yml +++ b/.github/workflows/test-packages-action-windows.yml @@ -250,8 +250,7 @@ jobs: continue-on-error: true with: name: 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 }}* + pattern: pkg-testrun-artifacts-${{ inputs.distro-slug }}-${{ inputs.pkg-type }}-* separate-directories: true delete-merged: true