Fix artifact output directories (#1004)

doldecomp · Nov 12, 2023 · 1fecc09 · 1fecc09
1 parent 1adba28
commit 1fecc09
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git 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
@@ -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