Skip to content

Commit 8783cae

Browse files
committed
Avoid publishing artifacts with conflicting names
.. as documented in actions/upload-artifact#480. (cherry picked from commit 0d4c676)
1 parent b6e3f39 commit 8783cae

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

.github/actions/upload_coverage/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ runs:
2424
- uses: actions/[email protected]
2525
with:
2626
path: "/tmp/codeclimate/*.json"
27-
name: codeclimate
27+
name: codeclimate-${{ inputs.flags }}

.github/workflows/build_and_test.yml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -284,10 +284,12 @@ jobs:
284284
check-arbitrary-configs parallel=4 CONFIGS=$TESTS
285285
- uses: "./.github/actions/save_logs_and_results"
286286
if: always()
287+
with:
288+
folder: ${{ env.PG_MAJOR }}_arbitrary_configs_${{ matrix.parallel }}
287289
- uses: "./.github/actions/upload_coverage"
288290
if: always()
289291
with:
290-
flags: ${{ env.pg_major }}_upgrade
292+
flags: ${{ env.PG_MAJOR }}_arbitrary_configs_${{ matrix.parallel }}
291293
codecov_token: ${{ secrets.CODECOV_TOKEN }}
292294
test-pg-upgrade:
293295
name: PG${{ matrix.old_pg_major }}-PG${{ matrix.new_pg_major }} - check-pg-upgrade
@@ -335,6 +337,8 @@ jobs:
335337
if: failure()
336338
- uses: "./.github/actions/save_logs_and_results"
337339
if: always()
340+
with:
341+
folder: ${{ env.old_pg_major }}_${{ env.new_pg_major }}_upgrade
338342
- uses: "./.github/actions/upload_coverage"
339343
if: always()
340344
with:
@@ -380,10 +384,12 @@ jobs:
380384
done;
381385
- uses: "./.github/actions/save_logs_and_results"
382386
if: always()
387+
with:
388+
folder: ${{ env.PG_MAJOR }}_citus_upgrade
383389
- uses: "./.github/actions/upload_coverage"
384390
if: always()
385391
with:
386-
flags: ${{ env.pg_major }}_upgrade
392+
flags: ${{ env.PG_MAJOR }}_citus_upgrade
387393
codecov_token: ${{ secrets.CODECOV_TOKEN }}
388394
upload-coverage:
389395
if: always()
@@ -401,8 +407,9 @@ jobs:
401407
steps:
402408
- uses: actions/[email protected]
403409
with:
404-
name: "codeclimate"
405-
path: "codeclimate"
410+
pattern: codeclimate*
411+
path: codeclimate
412+
merge-multiple: true
406413
- name: Upload coverage results to Code Climate
407414
run: |-
408415
cc-test-reporter sum-coverage codeclimate/*.json -o total.json

0 commit comments

Comments
 (0)