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

Revert to using v4 and alter pattern (leave off dash)

Browse source
This commit is contained in:
David Murphy 2024-09-09 13:13:50 -06:00 • committed by Daniel Wozniak
parent 059d1e0269
commit 9cef9a6ac0
9 changed files with 58 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2016,11 +2016,12 @@ jobs:
- name: Merge All Code Coverage Test Run Artifacts
continue-on-error: true
## DGM uses: actions/upload-artifact/merge@v4
uses: actions/upload-artifact/merge@v4.3.6
uses: actions/upload-artifact/merge@v4
## DGM uses: actions/upload-artifact/merge@v4.3.6
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

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

@ -2078,11 +2078,12 @@ jobs:
- name: Merge All Code Coverage Test Run Artifacts
continue-on-error: true
## DGM uses: actions/upload-artifact/merge@v4
uses: actions/upload-artifact/merge@v4.3.6
uses: actions/upload-artifact/merge@v4
## DGM uses: actions/upload-artifact/merge@v4.3.6
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

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

@ -2055,11 +2055,12 @@ jobs:
- name: Merge All Code Coverage Test Run Artifacts
continue-on-error: true
## DGM uses: actions/upload-artifact/merge@v4
uses: actions/upload-artifact/merge@v4.3.6
uses: actions/upload-artifact/merge@v4
## DGM uses: actions/upload-artifact/merge@v4.3.6
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

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

@ -359,11 +359,12 @@
- name: Merge All Code Coverage Test Run Artifacts
continue-on-error: true
## DGM uses: actions/upload-artifact/merge@v4
uses: actions/upload-artifact/merge@v4.3.6
uses: actions/upload-artifact/merge@v4
## DGM uses: actions/upload-artifact/merge@v4.3.6
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

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

@ -328,33 +328,36 @@ jobs:
- name: Merge JUnit XML Test Run Artifacts
if: always() && needs.test.result != 'cancelled' && needs.test.result != 'skipped'
continue-on-error: true
## DGM uses: actions/upload-artifact/merge@v4
uses: actions/upload-artifact/merge@v4.3.6
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 }}
pattern: 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 }}*
separate-directories: false
delete-merged: true
- name: Merge Log Test Run Artifacts
if: always() && needs.test.result != 'cancelled' && needs.test.result != 'skipped'
continue-on-error: true
## DGM uses: actions/upload-artifact/merge@v4
uses: actions/upload-artifact/merge@v4.3.6
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 }}
pattern: 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 }}*
separate-directories: false
delete-merged: true
- name: Merge Code Coverage Test Run Artifacts
if: ${{ inputs.skip-code-coverage == false }}
continue-on-error: true
## DGM uses: actions/upload-artifact/merge@v4
uses: actions/upload-artifact/merge@v4.3.6
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 }}
pattern: 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 }}*
separate-directories: false
delete-merged: true

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

@ -358,8 +358,8 @@ jobs:
- name: Merge JUnit XML Test Run Artifacts
if: always() && needs.test.result != 'cancelled' && needs.test.result != 'skipped'
continue-on-error: true
## DGM uses: actions/upload-artifact/merge@v4
uses: actions/upload-artifact/merge@v4.3.6
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 }}-*
@ -369,22 +369,24 @@ jobs:
- name: Merge Log Test Run Artifacts
if: always() && needs.test.result != 'cancelled' && needs.test.result != 'skipped'
continue-on-error: true
## DGM uses: actions/upload-artifact/merge@v4
uses: actions/upload-artifact/merge@v4.3.6
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 }}
pattern: 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 }}*
separate-directories: false
delete-merged: true
- name: Merge Code Coverage Test Run Artifacts
if: ${{ inputs.skip-code-coverage == false }}
continue-on-error: true
## DGM uses: actions/upload-artifact/merge@v4
uses: actions/upload-artifact/merge@v4.3.6
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 }}
pattern: 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 }}*
separate-directories: false
delete-merged: true

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

@ -329,33 +329,36 @@ jobs:
- name: Merge JUnit XML Test Run Artifacts
if: always() && needs.test.result != 'cancelled' && needs.test.result != 'skipped'
continue-on-error: true
## DGM uses: actions/upload-artifact/merge@v4
uses: actions/upload-artifact/merge@v4.3.6
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 }}-*
## 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
- name: Merge Log Test Run Artifacts
if: always() && needs.test.result != 'cancelled' && needs.test.result != 'skipped'
continue-on-error: true
## DGM uses: actions/upload-artifact/merge@v4
uses: actions/upload-artifact/merge@v4.3.6
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 }}
pattern: 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 }}*
separate-directories: false
delete-merged: true
- name: Merge Code Coverage Test Run Artifacts
if: ${{ inputs.skip-code-coverage == false }}
continue-on-error: true
## DGM uses: actions/upload-artifact/merge@v4
uses: actions/upload-artifact/merge@v4.3.6
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 }}
pattern: 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 }}*
separate-directories: false
delete-merged: true

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

@ -239,11 +239,12 @@ jobs:
- name: Merge Test Run Artifacts
continue-on-error: true
## DGM uses: actions/upload-artifact/merge@v4
uses: actions/upload-artifact/merge@v4.3.6
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 }}
pattern: 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 }}*
separate-directories: true
delete-merged: true

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

@ -246,12 +246,13 @@ jobs:
t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t"
- name: Merge Test Run Artifacts
## DGM uses: actions/upload-artifact/merge@v4
uses: actions/upload-artifact/merge@v4.3.6
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 }}
pattern: 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 }}*
separate-directories: true
delete-merged: true