From 26383eed337146aa730973814e53c2ce24672625 Mon Sep 17 00:00:00 2001
From: Sebastian Rittau <srittau@rittau.biz>
Date: Sun, 7 Apr 2024 15:04:37 +0200
Subject: [PATCH] Use separate artifact name per step (#11690)

Compatibility with actions/upload-artifact@v4
---
 .github/workflows/mypy_primer.yml         |  4 ++--
 .github/workflows/mypy_primer_comment.yml | 22 ++++++++++++----------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/mypy_primer.yml b/.github/workflows/mypy_primer.yml
index a7082d8e7..a239e733b 100644
--- a/.github/workflows/mypy_primer.yml
+++ b/.github/workflows/mypy_primer.yml
@@ -62,7 +62,7 @@ jobs:
       - name: Upload mypy_primer diff
         uses: actions/upload-artifact@v3
         with:
-          name: mypy_primer_diffs
+          name: mypy_primer_diff_${{ matrix.shard-index }}
           path: diff_${{ matrix.shard-index }}.txt
       - if: ${{ matrix.shard-index }} == 0
         name: Save PR number
@@ -72,5 +72,5 @@ jobs:
         name: Upload PR number
         uses: actions/upload-artifact@v3
         with:
-          name: mypy_primer_diffs
+          name: mypy_primer_diff_pr_number
           path: pr_number.txt
diff --git a/.github/workflows/mypy_primer_comment.yml b/.github/workflows/mypy_primer_comment.yml
index 67787dc1a..8b5aedd9f 100644
--- a/.github/workflows/mypy_primer_comment.yml
+++ b/.github/workflows/mypy_primer_comment.yml
@@ -27,18 +27,20 @@ jobs:
                repo: context.repo.repo,
                run_id: ${{ github.event.workflow_run.id }},
             });
-            const [matchArtifact] = artifacts.data.artifacts.filter((artifact) =>
-              artifact.name == "mypy_primer_diffs");
+            const matchArtifacts = artifacts.data.artifacts.filter((artifact) =>
+              artifact.name.startsWith("mypy_primer_diff"));
 
-            const download = await github.rest.actions.downloadArtifact({
-               owner: context.repo.owner,
-               repo: context.repo.repo,
-               artifact_id: matchArtifact.id,
-               archive_format: "zip",
-            });
-            fs.writeFileSync("diff.zip", Buffer.from(download.data));
+            for (const matchArtifact of matchArtifacts) {
+              const download = await github.rest.actions.downloadArtifact({
+                 owner: context.repo.owner,
+                 repo: context.repo.repo,
+                 artifact_id: matchArtifact.id,
+                 archive_format: "zip",
+              });
+              fs.writeFileSync(`${matchArtifact.name}.zip`, Buffer.from(download.data));
+            }
 
-      - run: unzip diff.zip
+      - run: for file in *.zip; do unzip $file; done
       - run: |
           cat diff_*.txt | tee fulldiff.txt