From 3237128aa984fc6b231c463b51d13db803845cb9 Mon Sep 17 00:00:00 2001
From: Bart Louwers <bart@emeel.net>
Date: Mon, 10 Jul 2023 13:52:06 +0200
Subject: [PATCH] Fix usage of download-workflow-run-artifact (#1328)

---
 .github/workflows/pr-render-test-result.yml |  2 ++
 .github/workflows/pr-size-test-result.yml   | 29 ++++-----------------
 2 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/pr-render-test-result.yml b/.github/workflows/pr-render-test-result.yml
index db48d9901..3ea6f737a 100644
--- a/.github/workflows/pr-render-test-result.yml
+++ b/.github/workflows/pr-render-test-result.yml
@@ -15,6 +15,8 @@ jobs:
     runs-on: ubuntu-22.04
     if: github.event.workflow_run.event == 'pull_request'
     steps:
+      - uses: actions/checkout@v3
+
       - uses: .github/actions/download-workflow-run-artifact
         with:
           artifact-name: render-test-result
diff --git a/.github/workflows/pr-size-test-result.yml b/.github/workflows/pr-size-test-result.yml
index ce5fda891..32bd6e774 100644
--- a/.github/workflows/pr-size-test-result.yml
+++ b/.github/workflows/pr-size-test-result.yml
@@ -10,31 +10,12 @@ jobs:
   comment-on-pr:
     runs-on: ubuntu-22.04
     steps:
-      # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#workflow_run
-      # TODO: de-duplicate with re-usable action
-      - name: 'Download size-test-result artifact'
-        uses: actions/github-script@v6
-        with:
-          script: |
-            let allArtifacts = await github.rest.actions.listWorkflowRunArtifacts({
-               owner: context.repo.owner,
-               repo: context.repo.repo,
-               run_id: context.payload.workflow_run.id,
-            });
-            let matchArtifact = allArtifacts.data.artifacts.filter((artifact) => {
-              return artifact.name == "size-test-result"
-            })[0];
-            let download = await github.rest.actions.downloadArtifact({
-               owner: context.repo.owner,
-               repo: context.repo.repo,
-               artifact_id: matchArtifact.id,
-               archive_format: 'zip',
-            });
-            let fs = require('fs');
-            fs.writeFileSync(`${process.env.GITHUB_WORKSPACE}/size-test-result.zip`, Buffer.from(download.data));
+      - uses: actions/checkout@v3
 
-      - name: 'Unzip render-test-result artifact'
-        run: unzip size-test-result.zip
+      - uses: .github/actions/download-workflow-run-artifact
+        with:
+          artifact-name: size-test-result
+          expect-files: "./pr_number, ./size"
 
       - name: Show directory structure
         run: ls -R