From 6590066ebcf72d6c4a56730dd682088db17d7df0 Mon Sep 17 00:00:00 2001
From: Marco Ceppi <marco@ceppi.net>
Date: Mon, 27 Feb 2023 23:04:56 -0500
Subject: [PATCH] fix: artifact upload/extract (#88)

---
 .github/workflows/build.yml      |  4 ++--
 .github/workflows/pr-publish.yml | 28 +++++++---------------------
 2 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ddbce9b4d0..6d84a13083 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -157,8 +157,8 @@ jobs:
         run: |
           mkdir -p output
           podman save -o output/image.tar ${{ steps.build_image.outputs.image }}
-          echo "image=${{ steps.build_image.outputs.image }}" >> output/meta
-          echo "tags=${{ steps.build_image.outputs.tags }}" >> output/meta
+          echo "${{ steps.build_image.outputs.image }}" >> output/image
+          echo "${{ steps.build_image.outputs.tags }}" >> output/tags
       
       - name: Publish Artifact
         uses: actions/upload-artifact@v2
diff --git a/.github/workflows/pr-publish.yml b/.github/workflows/pr-publish.yml
index ebc4b55d06..f84f0d0c03 100644
--- a/.github/workflows/pr-publish.yml
+++ b/.github/workflows/pr-publish.yml
@@ -17,33 +17,19 @@ jobs:
       github.event.workflow_run.event == 'pull_request' &&
       github.event.workflow_run.conclusion == 'success'
     steps:
-      - name: 'Download artifact'
-        uses: actions/github-script@v3.1.0
+      - uses: actions/download-artifact@v3
         with:
-          script: |
-            var artifacts = await github.actions.listWorkflowRunArtifacts({
-               owner: context.repo.owner,
-               repo: context.repo.repo,
-               run_id: ${{github.event.workflow_run.id }},
-            });
-            var matchArtifact = artifacts.data.artifacts.filter((artifact) => {
-              return artifact.name == "output"
-            })[0];
-            var download = await github.actions.downloadArtifact({
-               owner: context.repo.owner,
-               repo: context.repo.repo,
-               artifact_id: matchArtifact.id,
-               archive_format: 'zip',
-            });
-            var fs = require('fs');
-            fs.writeFileSync('${{github.workspace}}/output.zip', Buffer.from(download.data));
-      - run: unzip output.zip
+          name: output
 
       - name: Load Container Image
         id: load_image
         run: |
+          ls -lah
+          cat image
+          cat tags
           podman load -i image.tar
-          cat meta >> $GITHUB_OUTPUT
+          echo image="$(cat image)" >> $GITHUB_OUTPUT
+          echo tags="$(cat tags)" >> $GITHUB_OUTPUT
 
       - name: Lowercase Registry
         id: registry_case