mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Allow merging artifacts not to fail on re-runs
This commit is contained in:
parent
00faf135ed
commit
91f63da162
6 changed files with 12 additions and 12 deletions
6
.github/workflows/test-action-linux.yml
vendored
6
.github/workflows/test-action-linux.yml
vendored
|
@ -322,7 +322,7 @@ jobs:
|
|||
if: always() && needs.test.result != 'cancelled' && needs.test.result != 'skipped'
|
||||
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 }}-*
|
||||
pattern: testrun-junit-artifacts-${{ inputs.distro-slug }}${{ inputs.fips && '-fips' || '' }}-${{ inputs.nox-session }}*
|
||||
separate-directories: false
|
||||
delete-merged: true
|
||||
|
||||
|
@ -331,7 +331,7 @@ jobs:
|
|||
if: always() && needs.test.result != 'cancelled' && needs.test.result != 'skipped'
|
||||
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 }}-*
|
||||
pattern: testrun-log-artifacts-${{ inputs.distro-slug }}${{ inputs.fips && '-fips' || '' }}-${{ inputs.nox-session }}*
|
||||
separate-directories: false
|
||||
delete-merged: true
|
||||
|
||||
|
@ -341,7 +341,7 @@ jobs:
|
|||
id: merge-coverage-artifacts
|
||||
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 }}-*
|
||||
pattern: testrun-coverage-artifacts-${{ inputs.distro-slug }}${{ inputs.fips && '-fips' || '' }}-${{ inputs.nox-session }}*
|
||||
separate-directories: false
|
||||
delete-merged: true
|
||||
|
||||
|
|
6
.github/workflows/test-action-macos.yml
vendored
6
.github/workflows/test-action-macos.yml
vendored
|
@ -350,7 +350,7 @@ jobs:
|
|||
if: always() && needs.test.result != 'cancelled' && needs.test.result != 'skipped'
|
||||
with:
|
||||
name: 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
|
||||
|
||||
|
@ -359,7 +359,7 @@ jobs:
|
|||
if: always() && needs.test.result != 'cancelled' && needs.test.result != 'skipped'
|
||||
with:
|
||||
name: 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
|
||||
|
||||
|
@ -369,7 +369,7 @@ jobs:
|
|||
id: merge-coverage-artifacts
|
||||
with:
|
||||
name: 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
|
||||
|
||||
|
|
6
.github/workflows/test-action-windows.yml
vendored
6
.github/workflows/test-action-windows.yml
vendored
|
@ -323,7 +323,7 @@ jobs:
|
|||
if: always() && needs.test.result != 'cancelled' && needs.test.result != 'skipped'
|
||||
with:
|
||||
name: 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
|
||||
|
||||
|
@ -332,7 +332,7 @@ jobs:
|
|||
if: always() && needs.test.result != 'cancelled' && needs.test.result != 'skipped'
|
||||
with:
|
||||
name: 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
|
||||
|
||||
|
@ -342,7 +342,7 @@ jobs:
|
|||
id: merge-coverage-artifacts
|
||||
with:
|
||||
name: 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
|
||||
|
||||
|
|
|
@ -255,7 +255,7 @@ jobs:
|
|||
uses: actions/upload-artifact/merge@v4
|
||||
with:
|
||||
name: 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
|
||||
|
||||
|
|
|
@ -238,7 +238,7 @@ jobs:
|
|||
uses: actions/upload-artifact/merge@v4
|
||||
with:
|
||||
name: 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
|
||||
|
||||
|
|
|
@ -254,7 +254,7 @@ jobs:
|
|||
uses: actions/upload-artifact/merge@v4
|
||||
with:
|
||||
name: 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
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue