fix Conflict: an artifact with this name already exists on the workfl…

…ow run
Draegerwerk · Nov 26, 2024 · e01d8ca · e01d8ca
1 parent 57b55ff
commit e01d8ca
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -102,15 +102,15 @@ jobs:
         uses: actions/upload-artifact@v4
         if: success() || failure()  # upload artifacts also if test stage failed
         with:
-          name: unittest_reports
+          name: unittest_report_${{ matrix.os }}_py${{ matrix.python-version }}_${{ env.SUFFIX }}.html
           path: pytest_reports/unittest_report_${{ matrix.os }}_py${{ matrix.python-version }}_${{ env.SUFFIX }}.html
           retention-days: 5
 
       - name: Archive test log
         uses: actions/upload-artifact@v4
         if: success() || failure()  # upload artifacts also if test stage failed
         with:
-          name: pytest_logs
+          name: pytest_${{ matrix.os }}_py${{ matrix.python-version }}_${{ env.SUFFIX }}.log
           path: pytest_${{ matrix.os }}_py${{ matrix.python-version }}_${{ env.SUFFIX }}.log
           retention-days: 5
 

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -57,8 +57,9 @@ jobs:
       - name: Download Unittest report
         uses: actions/download-artifact@v4
         with:
-          name: unittest_reports
+          pattern: unittest_report_*
           path: pytest_reports/
+          merge-multiple: true
 
       - name: Zip unittest reports
         uses: vimtor/[email protected]