Merge pull request #1677 from OceanParcels/dependabot/github_actions/…

…actions/download-artifact-4 Bump actions/download-artifact from 3 to 4
OceanParcels · Aug 30, 2024 · 2e8b446 · 2e8b446
2 parents 85b6cde + 852f72c
commit 2e8b446
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -49,9 +49,9 @@ jobs:
           flags: unit-tests
       - name: Upload test results
         if: ${{ always() }} # Always run this step, even if tests fail
-        uses: actions/upload-artifact@v3.1.2
+        uses: actions/upload-artifact@v4
         with:
-          name: Unittest report
+          name: Unittest report ${{ matrix.os }}-${{ matrix.python-version }}
           path: ${{ matrix.os }}_${{ matrix.python-version }}_unit_test_report.html
   integration-test:
     name: "py${{ matrix.python-version }} | ${{ matrix.os }} | integration tests"
@@ -79,10 +79,21 @@ jobs:
           flags: integration-tests
       - name: Upload test results
         if: ${{ always() }} # Always run this step, even if tests fail
-        uses: actions/upload-artifact@v3.1.2
+        uses: actions/upload-artifact@v4
         with:
-          name: Integration test report
+          name: Integration test report ${{ matrix.os }}
           path: ${{ matrix.os }}_integration_test_report.html
+  merge-test-artifacts:
+    runs-on: ubuntu-latest
+    needs:
+      - unit-test
+      - integration-test
+    steps:
+    - name: Merge Artifacts
+      uses: actions/upload-artifact/merge@v4
+      with:
+        name: Testing reports
+        pattern: "* report *"
   typechecking:
     name: mypy
     runs-on: ubuntu-latest

diff --git a/.github/workflows/pypi-release.yml b/.github/workflows/pypi-release.yml
@@ -42,7 +42,7 @@ jobs:
           else
             echo "✅ Looks good"
           fi
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: releases
           path: dist
@@ -55,7 +55,7 @@ jobs:
         name: Install Python
         with:
           python-version: 3.10
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: releases
           path: dist
@@ -84,7 +84,7 @@ jobs:
     if: github.event_name == 'release'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: releases
           path: dist