Skip to content

Commit

Permalink
removing commented out 4.3.6, and added debugging
Browse files Browse the repository at this point in the history
  • Loading branch information
dmurphy18 committed Sep 10, 2024
1 parent 9f10d73 commit 7cb55c9
Show file tree
Hide file tree
Showing 9 changed files with 6 additions and 23 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
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

Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
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

Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/scheduled.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
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

Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/templates/ci.yml.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
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

Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/test-action-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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/[email protected]
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 }}-*
Expand All @@ -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/[email protected]
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 }}-*
Expand All @@ -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/[email protected]
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 }}-*
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/test-action-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
with:
name: testrun-junit-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}
pattern: testrun-junit-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-*
Expand All @@ -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/[email protected]
with:
name: testrun-log-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}
## DGM pattern: testrun-log-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-*
Expand All @@ -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/[email protected]
with:
name: testrun-coverage-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}
## DGM pattern: testrun-coverage-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-*
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/test-action-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
with:
name: testrun-junit-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}
## DGM pattern: testrun-junit-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-*
Expand All @@ -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/[email protected]
with:
name: testrun-log-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}
## DGM pattern: testrun-log-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-*
Expand All @@ -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/[email protected]
with:
name: testrun-coverage-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}
## DGM pattern: testrun-coverage-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-*
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test-packages-action-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
with:
name: pkg-testrun-artifacts-${{ inputs.distro-slug }}-${{ inputs.pkg-type }}
## DGM pattern: pkg-testrun-artifacts-${{ inputs.distro-slug }}-${{ inputs.pkg-type }}-*
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test-packages-action-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,6 @@ jobs:
- name: Merge Test Run Artifacts
uses: actions/upload-artifact/merge@v4
## DGM uses: actions/upload-artifact/[email protected]
continue-on-error: true
with:
name: pkg-testrun-artifacts-${{ inputs.distro-slug }}-${{ inputs.pkg-type }}
Expand Down

0 comments on commit 7cb55c9

Please sign in to comment.