Merge pull request #348 from UW-GAC/dependabot/github_actions/actions…

…/upload-artifact-4 Bump actions/upload-artifact from 3 to 4
UW-GAC · Dec 18, 2023 · 7f245e0 · 7f245e0
2 parents d8d0bc1 + 53b160b
commit 7f245e0
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -91,9 +91,9 @@ jobs:
           ANVIL_API_SERVICE_ACCOUNT_FILE: foo
 
       - name: Upload coverage data
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: coverage-data
+          name: coverage-data-mysql-${{ strategy.job-index }}
           path: .coverage.*
 
   pytest-sqlite:
@@ -125,9 +125,9 @@ jobs:
           ANVIL_API_SERVICE_ACCOUNT_FILE: foo
 
       - name: Upload coverage data
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: coverage-data
+          name: coverage-data-sqlite-${{ strategy.job-index }}
           path: .coverage.*
 
   coverage:
@@ -148,10 +148,16 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install --upgrade coverage "django<4" django-coverage-plugin
+
       - name: Download coverage data
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
-          name: coverage-data
+          path: ./artifacts/
+
+      - name: Merge coverage files
+        run: |
+          mv ./artifacts/coverage-data*/.coverage* .
+          ls -la .coverage*
 
       - name: Combine coverage data
         run: |