From 065d1635a38dfc2a7a0a61b460ba4a5844b9a83e Mon Sep 17 00:00:00 2001
From: Sebastian Krysmanski <noreply@manski.net>
Date: Sun, 3 Mar 2024 16:34:36 +0100
Subject: [PATCH] Fix branch names in artifact names (hopefully)

---
 .github/workflows/build-and-deploy.yaml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-and-deploy.yaml b/.github/workflows/build-and-deploy.yaml
index 8919238..e99228a 100644
--- a/.github/workflows/build-and-deploy.yaml
+++ b/.github/workflows/build-and-deploy.yaml
@@ -173,7 +173,6 @@ jobs:
         # For syntax, see: https://www.gnu.org/software/bash/manual/bash.html#Shell-Parameter-Expansion
         # Strips "feature/" from PR branch names. Also replaces '/' with '-'.
         run: echo "${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" | sed 's#^feature/##' | sed 's#/#-#' | xargs printf "branch=%s\n" >> $GITHUB_OUTPUT
-        shell: bash
 
       #
       # Store generated files in a zip file in the workflow itself. This way outputs between two workflow runs can be compared,
@@ -189,7 +188,7 @@ jobs:
       - name: Attach generated files to workflow run
         uses: actions/upload-artifact@v4
         with:
-          name: 'published-output__#${{ github.run_number }}__${{ steps.file-branch-name.outputs.value }}'
+          name: 'published-output__#${{ github.run_number }}__${{ steps.file-branch-name.outputs.branch }}'
           path: ${{ env.PUBLISH_DIR }}
           if-no-files-found: error
 
@@ -198,7 +197,7 @@ jobs:
       - name: Attach generated files (diffable) to workflow run
         uses: actions/upload-artifact@v4
         with:
-          name: 'diffable-output__#${{ github.run_number }}__${{ steps.file-branch-name.outputs.value }}'
+          name: 'diffable-output__#${{ github.run_number }}__${{ steps.file-branch-name.outputs.branch }}'
           path: ${{ env.DIFF_PUBLISH_DIR }}
           if-no-files-found: error