saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

removing commented out 4.3.6, and added debugging

Browse source
This commit is contained in:
David Murphy 2024-09-10 14:45:22 -06:00 • committed by Daniel Wozniak
parent 9cef9a6ac0
commit 3827456452
9 changed files with 6 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/ci.yml vendored
View file

@ -2017,11 +2017,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

4
.github/workflows/nightly.yml vendored
View file

@ -2079,11 +2079,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

4
.github/workflows/scheduled.yml vendored
View file

@ -2056,11 +2056,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

4
.github/workflows/templates/ci.yml.jinja vendored
View file

@ -360,11 +360,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

5
.github/workflows/test-action-linux.yml vendored
View file

@ -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 }}-*

3
.github/workflows/test-action-macos.yml vendored
View file

@ -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 }}-*

3
.github/workflows/test-action-windows.yml vendored
View file

@ -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 }}-*

1
.github/workflows/test-packages-action-macos.yml vendored
View file

@ -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 }}-*

1
.github/workflows/test-packages-action-windows.yml vendored
View file

@ -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 }}