Skip to content

Commit df1061c

Browse files
s0undt3chs0undt3ch
committed
Yet some more artifact merging fixes
1 parent 148e63e commit df1061c

10 files changed

+35
-26
lines changed

‎.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2088,11 +2088,11 @@ jobs:
20882088
20892089
20902090
- name: Merge All Code Coverage Test Run Artifacts
2091+
continue-on-error: true
20912092
uses: actions/upload-artifact/merge@v4
2092-
id: merge-coverage-artifacts
20932093
with:
20942094
name: all-testrun-coverage-artifacts
2095-
pattern: all-testrun-coverage-artifacts*
2095+
pattern: all-testrun-coverage-artifacts-*
20962096
separate-directories: false
20972097
delete-merged: true
20982098

‎.github/workflows/nightly.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2153,11 +2153,11 @@ jobs:
21532153
21542154
21552155
- name: Merge All Code Coverage Test Run Artifacts
2156+
continue-on-error: true
21562157
uses: actions/upload-artifact/merge@v4
2157-
id: merge-coverage-artifacts
21582158
with:
21592159
name: all-testrun-coverage-artifacts
2160-
pattern: all-testrun-coverage-artifacts*
2160+
pattern: all-testrun-coverage-artifacts-*
21612161
separate-directories: false
21622162
delete-merged: true
21632163

‎.github/workflows/scheduled.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2135,11 +2135,11 @@ jobs:
21352135
21362136
21372137
- name: Merge All Code Coverage Test Run Artifacts
2138+
continue-on-error: true
21382139
uses: actions/upload-artifact/merge@v4
2139-
id: merge-coverage-artifacts
21402140
with:
21412141
name: all-testrun-coverage-artifacts
2142-
pattern: all-testrun-coverage-artifacts*
2142+
pattern: all-testrun-coverage-artifacts-*
21432143
separate-directories: false
21442144
delete-merged: true
21452145

‎.github/workflows/templates/ci.yml.jinja

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -348,11 +348,11 @@
348348
#}
349349

350350
- name: Merge All Code Coverage Test Run Artifacts
351+
continue-on-error: true
351352
uses: actions/upload-artifact/merge@v4
352-
id: merge-coverage-artifacts
353353
with:
354354
name: all-testrun-coverage-artifacts
355-
pattern: all-testrun-coverage-artifacts*
355+
pattern: all-testrun-coverage-artifacts-*
356356
separate-directories: false
357357
delete-merged: true
358358

‎.github/workflows/test-action-linux.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -318,30 +318,32 @@ jobs:
318318
t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t"
319319
320320
- name: Merge JUnit XML Test Run Artifacts
321-
uses: actions/upload-artifact/merge@v4
322321
if: always() && needs.test.result != 'cancelled' && needs.test.result != 'skipped'
322+
continue-on-error: true
323+
uses: actions/upload-artifact/merge@v4
323324
with:
324325
name: testrun-junit-artifacts-${{ inputs.distro-slug }}${{ inputs.fips && '-fips' || '' }}-${{ inputs.nox-session }}
325-
pattern: testrun-junit-artifacts-${{ inputs.distro-slug }}${{ inputs.fips && '-fips' || '' }}-${{ inputs.nox-session }}*
326+
pattern: testrun-junit-artifacts-${{ inputs.distro-slug }}${{ inputs.fips && '-fips' || '' }}-${{ inputs.nox-session }}-*
326327
separate-directories: false
327328
delete-merged: true
328329

329330
- name: Merge Log Test Run Artifacts
330-
uses: actions/upload-artifact/merge@v4
331331
if: always() && needs.test.result != 'cancelled' && needs.test.result != 'skipped'
332+
continue-on-error: true
333+
uses: actions/upload-artifact/merge@v4
332334
with:
333335
name: testrun-log-artifacts-${{ inputs.distro-slug }}${{ inputs.fips && '-fips' || '' }}-${{ inputs.nox-session }}
334-
pattern: testrun-log-artifacts-${{ inputs.distro-slug }}${{ inputs.fips && '-fips' || '' }}-${{ inputs.nox-session }}*
336+
pattern: testrun-log-artifacts-${{ inputs.distro-slug }}${{ inputs.fips && '-fips' || '' }}-${{ inputs.nox-session }}-*
335337
separate-directories: false
336338
delete-merged: true
337339

338340
- name: Merge Code Coverage Test Run Artifacts
339-
uses: actions/upload-artifact/merge@v4
340341
if: ${{ inputs.skip-code-coverage == false }}
341-
id: merge-coverage-artifacts
342+
continue-on-error: true
343+
uses: actions/upload-artifact/merge@v4
342344
with:
343345
name: testrun-coverage-artifacts-${{ inputs.distro-slug }}${{ inputs.fips && '-fips' || '' }}-${{ inputs.nox-session }}
344-
pattern: testrun-coverage-artifacts-${{ inputs.distro-slug }}${{ inputs.fips && '-fips' || '' }}-${{ inputs.nox-session }}*
346+
pattern: testrun-coverage-artifacts-${{ inputs.distro-slug }}${{ inputs.fips && '-fips' || '' }}-${{ inputs.nox-session }}-*
345347
separate-directories: false
346348
delete-merged: true
347349

‎.github/workflows/test-action-macos.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -346,27 +346,29 @@ jobs:
346346
t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t"
347347
348348
- name: Merge JUnit XML Test Run Artifacts
349-
uses: actions/upload-artifact/merge@v4
350349
if: always() && needs.test.result != 'cancelled' && needs.test.result != 'skipped'
350+
continue-on-error: true
351+
uses: actions/upload-artifact/merge@v4
351352
with:
352353
name: testrun-junit-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}
353354
pattern: testrun-junit-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}*
354355
separate-directories: false
355356
delete-merged: true
356357

357358
- name: Merge Log Test Run Artifacts
358-
uses: actions/upload-artifact/merge@v4
359359
if: always() && needs.test.result != 'cancelled' && needs.test.result != 'skipped'
360+
continue-on-error: true
361+
uses: actions/upload-artifact/merge@v4
360362
with:
361363
name: testrun-log-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}
362364
pattern: testrun-log-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}*
363365
separate-directories: false
364366
delete-merged: true
365367

366368
- name: Merge Code Coverage Test Run Artifacts
367-
uses: actions/upload-artifact/merge@v4
368369
if: ${{ inputs.skip-code-coverage == false }}
369-
id: merge-coverage-artifacts
370+
continue-on-error: true
371+
uses: actions/upload-artifact/merge@v4
370372
with:
371373
name: testrun-coverage-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}
372374
pattern: testrun-coverage-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}*

‎.github/workflows/test-action-windows.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -319,27 +319,29 @@ jobs:
319319
t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t"
320320
321321
- name: Merge JUnit XML Test Run Artifacts
322-
uses: actions/upload-artifact/merge@v4
323322
if: always() && needs.test.result != 'cancelled' && needs.test.result != 'skipped'
323+
continue-on-error: true
324+
uses: actions/upload-artifact/merge@v4
324325
with:
325326
name: testrun-junit-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}
326327
pattern: testrun-junit-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}*
327328
separate-directories: false
328329
delete-merged: true
329330

330331
- name: Merge Log Test Run Artifacts
331-
uses: actions/upload-artifact/merge@v4
332332
if: always() && needs.test.result != 'cancelled' && needs.test.result != 'skipped'
333+
continue-on-error: true
334+
uses: actions/upload-artifact/merge@v4
333335
with:
334336
name: testrun-log-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}
335337
pattern: testrun-log-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}*
336338
separate-directories: false
337339
delete-merged: true
338340

339341
- name: Merge Code Coverage Test Run Artifacts
340-
uses: actions/upload-artifact/merge@v4
341342
if: ${{ inputs.skip-code-coverage == false }}
342-
id: merge-coverage-artifacts
343+
continue-on-error: true
344+
uses: actions/upload-artifact/merge@v4
343345
with:
344346
name: testrun-coverage-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}
345347
pattern: testrun-coverage-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}*

‎.github/workflows/test-packages-action-linux.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,10 +252,11 @@ jobs:
252252
t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t"
253253
254254
- name: Merge Test Run Artifacts
255+
continue-on-error: true
255256
uses: actions/upload-artifact/merge@v4
256257
with:
257258
name: pkg-testrun-artifacts-${{ inputs.distro-slug }}${{ inputs.fips && '-fips' || '' }}-${{ inputs.pkg-type }}
258-
pattern: pkg-testrun-artifacts-${{ inputs.distro-slug }}${{ inputs.fips && '-fips' || '' }}-${{ inputs.pkg-type }}*
259+
pattern: pkg-testrun-artifacts-${{ inputs.distro-slug }}${{ inputs.fips && '-fips' || '' }}-${{ inputs.pkg-type }}-*
259260
separate-directories: true
260261
delete-merged: true
261262

‎.github/workflows/test-packages-action-macos.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,10 +235,11 @@ jobs:
235235
t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t"
236236
237237
- name: Merge Test Run Artifacts
238+
continue-on-error: true
238239
uses: actions/upload-artifact/merge@v4
239240
with:
240241
name: pkg-testrun-artifacts-${{ inputs.distro-slug }}-${{ inputs.pkg-type }}
241-
pattern: pkg-testrun-artifacts-${{ inputs.distro-slug }}-${{ inputs.pkg-type }}*
242+
pattern: pkg-testrun-artifacts-${{ inputs.distro-slug }}-${{ inputs.pkg-type }}-*
242243
separate-directories: true
243244
delete-merged: true
244245

‎.github/workflows/test-packages-action-windows.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,9 +252,10 @@ jobs:
252252
253253
- name: Merge Test Run Artifacts
254254
uses: actions/upload-artifact/merge@v4
255+
continue-on-error: true
255256
with:
256257
name: pkg-testrun-artifacts-${{ inputs.distro-slug }}-${{ inputs.pkg-type }}
257-
pattern: pkg-testrun-artifacts-${{ inputs.distro-slug }}-${{ inputs.pkg-type }}*
258+
pattern: pkg-testrun-artifacts-${{ inputs.distro-slug }}-${{ inputs.pkg-type }}-*
258259
separate-directories: true
259260
delete-merged: true
260261

0 commit comments

Comments
 (0)