Skip to content

Commit cd3e12f

Browse files
committed
Avoid publishing artifacts with conflicting names
.. as documented in actions/upload-artifact#480. (cherry picked from commit 26f16a7)
1 parent 5939569 commit cd3e12f

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
@@ -260,10 +260,12 @@ jobs:
260260
check-arbitrary-configs parallel=4 CONFIGS=$TESTS
261261
- uses: "./.github/actions/save_logs_and_results"
262262
if: always()
263+
with:
264+
folder: ${{ env.PG_MAJOR }}_arbitrary_configs_${{ matrix.parallel }}
263265
- uses: "./.github/actions/upload_coverage"
264266
if: always()
265267
with:
266-
flags: ${{ env.pg_major }}_upgrade
268+
flags: ${{ env.PG_MAJOR }}_arbitrary_configs_${{ matrix.parallel }}
267269
codecov_token: ${{ secrets.CODECOV_TOKEN }}
268270
test-pg-upgrade:
269271
name: PG${{ matrix.old_pg_major }}-PG${{ matrix.new_pg_major }} - check-pg-upgrade
@@ -309,6 +311,8 @@ jobs:
309311
if: failure()
310312
- uses: "./.github/actions/save_logs_and_results"
311313
if: always()
314+
with:
315+
folder: ${{ env.old_pg_major }}_${{ env.new_pg_major }}_upgrade
312316
- uses: "./.github/actions/upload_coverage"
313317
if: always()
314318
with:
@@ -354,10 +358,12 @@ jobs:
354358
done;
355359
- uses: "./.github/actions/save_logs_and_results"
356360
if: always()
361+
with:
362+
folder: ${{ env.PG_MAJOR }}_citus_upgrade
357363
- uses: "./.github/actions/upload_coverage"
358364
if: always()
359365
with:
360-
flags: ${{ env.pg_major }}_upgrade
366+
flags: ${{ env.PG_MAJOR }}_citus_upgrade
361367
codecov_token: ${{ secrets.CODECOV_TOKEN }}
362368
upload-coverage:
363369
if: always()
@@ -375,8 +381,9 @@ jobs:
375381
steps:
376382
- uses: actions/[email protected]
377383
with:
378-
name: "codeclimate"
379-
path: "codeclimate"
384+
pattern: codeclimate*
385+
path: codeclimate
386+
merge-multiple: true
380387
- name: Upload coverage results to Code Climate
381388
run: |-
382389
cc-test-reporter sum-coverage codeclimate/*.json -o total.json

0 commit comments

Comments
 (0)