Merge branch 'main' into fix_tuple_type

napari · Sep 9, 2024 · 4e46eb4 · 4e46eb4
2 parents 9ff0b2c + f73691f
commit 4e46eb4
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -53,11 +53,12 @@ jobs:
           coverage run --source=npe2 -m pytest --color yes
 
       - name: Upload coverage as artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: coverage reports
+          name: coverage reports ${{ matrix.platform }} py ${{ matrix.python-version }} ${{ (matrix.pydantic == 'pydantic<2' && 'pydantic_lt_2') || 'pydantic_gt_2' }}
           path: |
             ./.coverage.*
+          include-hidden-files: true
 
   test_napari:
     name: napari tests
@@ -124,10 +125,11 @@ jobs:
           pip install codecov
 
       - name: Download coverage data
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
-          name: coverage reports
+          pattern: coverage reports*
           path: coverage
+          merge-multiple: true
 
       - name: combine coverage data
         run: |