build: artifact@4, with required immutability changes

https://github.com/actions/upload-artifact/blob/main/docs/MIGRATION.md with discussion here: actions/upload-artifact#472
nedbat · Dec 20, 2023 · c2e8483 · c2e8483
1 parent 962429c
commit c2e8483
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 16 deletions.
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -31,6 +31,8 @@ jobs:
   coverage:
     name: "${{ matrix.python-version }} on ${{ matrix.os }}"
     runs-on: "${{ matrix.os }}-latest"
+    env:
+      MATRIX_ID: "${{ matrix.python-version }}.${{ matrix.os }}"
 
     strategy:
       matrix:
@@ -76,6 +78,7 @@ jobs:
 
       - name: "Install dependencies"
         run: |
+          echo matrix id: $MATRIX_ID
           set -xe
           python -VV
           python -m site
@@ -94,12 +97,12 @@ jobs:
           COVERAGE_RCFILE: "metacov.ini"
         run: |
           python -m coverage combine
-          mv .metacov .metacov.${{ matrix.python-version }}.${{ matrix.os }}
+          mv .metacov .metacov.$MATRIX_ID
 
       - name: "Upload coverage data"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: metacov
+          name: metacov-${{ env.MATRIX_ID }}
           path: .metacov.*
 
   combine:
@@ -131,9 +134,9 @@ jobs:
           python igor.py zip_mods
 
       - name: "Download coverage data"
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
-          name: metacov
+          pattern: metacov-*
 
       - name: "Combine and report"
         id: combine
@@ -144,7 +147,7 @@ jobs:
           python igor.py combine_html
 
       - name: "Upload HTML report"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: html_report
           path: htmlcov
@@ -193,7 +196,7 @@ jobs:
 
       - name: "Download coverage HTML report"
         if: ${{ github.ref == 'refs/heads/master' }}
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: html_report
           path: reports_repo/${{ env.report_dir }}

diff --git a/.github/workflows/kit.yml b/.github/workflows/kit.yml
@@ -49,6 +49,8 @@ jobs:
   wheels:
     name: "${{ matrix.py }} ${{ matrix.os }} ${{ matrix.arch }} wheels"
     runs-on: ${{ matrix.os }}-latest
+    env:
+      MATRIX_ID: "${{ matrix.py }}-${{ matrix.os }}-${{ matrix.arch }}"
     strategy:
       matrix:
         include:
@@ -173,9 +175,9 @@ jobs:
           ls -al wheelhouse/
 
       - name: "Upload wheels"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: dist
+          name: dist-${{ env.MATRIX_ID }}
           path: wheelhouse/*.whl
           retention-days: 7
 
@@ -207,9 +209,9 @@ jobs:
           ls -al dist/
 
       - name: "Upload sdist"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: dist
+          name: dist-sdist
           path: dist/*.tar.gz
           retention-days: 7
 
@@ -245,9 +247,9 @@ jobs:
           ls -al dist/
 
       - name: "Upload wheels"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: dist
+          name: dist-pypy
           path: dist/*.whl
           retention-days: 7
 
@@ -264,9 +266,9 @@ jobs:
       id-token: write
     steps:
       - name: "Download artifacts"
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
-          name: dist
+          pattern: dist-*
 
       - name: "Sign artifacts"
         uses: sigstore/gh-action-sigstore-python@v2.1.1
@@ -278,7 +280,7 @@ jobs:
           ls -alR
 
       - name: "Upload signatures"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: signatures
           path: |