From 1fecc0914a7f90b95dc97cd9fc44c1d1c9f16287 Mon Sep 17 00:00:00 2001
From: Robin Avery <robin@ribbanya.dev>
Date: Sat, 11 Nov 2023 19:40:51 -0500
Subject: [PATCH] Fix artifact output directories (#1004)

---
 .github/workflows/dump-asm.yml      | 8 ++++----
 .github/workflows/publish-pages.yml | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/dump-asm.yml b/.github/workflows/dump-asm.yml
index b6ab5899ce..2c0ea6b34e 100644
--- a/.github/workflows/dump-asm.yml
+++ b/.github/workflows/dump-asm.yml
@@ -12,6 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       REGISTRY: ghcr.io
+      OUTPUT: ${{ github.workspace }}/output
     steps:
       - name: Get image name
         env:
@@ -49,14 +50,13 @@ jobs:
 
       - name: Dump assembly
         run: |
-          output="${{ github.workspace }}/output"
-          mkdir -p "$output"
+          mkdir -p "${{ env.OUTPUT }}"
           short_sha="$(echo "${{ github.sha }}" | cut -c 1-7)"
           tree_url="${{ github.server_url }}/${{ github.repository }}/tree/${{ github.sha }}"
           docker run --rm \
             --user "$(id -u):$(id -g)" \
             --volume "$PWD:/input:ro" \
-            --volume "$output:/output" \
+            --volume "${{ env.OUTPUT }}:/output" \
             -e SHORT_SHA="$short_sha" \
             -e TREE_URL="$tree_url" \
             ${{ env.REGISTRY }}/${{ env.IMAGE }}
@@ -65,7 +65,7 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: dump
-          path: /tmp/output
+          path: ${{ env.OUTPUT }}
 
   push-dump:
     name: Push dump
diff --git a/.github/workflows/publish-pages.yml b/.github/workflows/publish-pages.yml
index 5818ef27b9..c950de5c91 100644
--- a/.github/workflows/publish-pages.yml
+++ b/.github/workflows/publish-pages.yml
@@ -13,6 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       REGISTRY: ghcr.io
+      OUTPUT: ${{ github.workspace }}/output
     steps:
       - name: Get image name
         env:
@@ -50,19 +51,18 @@ jobs:
 
       - name: Generate pages
         run: |
-          output="${{ github.workspace }}/output"
-          mkdir -p "$output"
+          mkdir -p "${{ env.OUTPUT }}"
           docker run --rm \
             --user "$(id -u):$(id -g)" \
             --volume "$PWD:/input:ro" \
-            --volume "$output:/output" \
+            --volume "${{ env.OUTPUT }}:/output" \
             ${{ env.REGISTRY }}/${{ env.IMAGE }}
 
       - name: Upload generated pages
         uses: actions/upload-artifact@v3
         with:
           name: pages
-          path: /tmp/output
+          path: ${{ env.OUTPUT }}
 
   deploy-pages:
     name: Deploy to GitHub Pages