deploy: correctly name the branch for both PR and tag builds

moergo-sc · Dec 9, 2023 · d28e9fc · d28e9fc
1 parent ad3a1f2
commit d28e9fc
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/.github/workflows/build-container.yml b/.github/workflows/build-container.yml
@@ -38,9 +38,11 @@ jobs:
         shell: bash
         run: |
           if [ "$GITHUB_HEAD_REF" ]; then
+            branch_ref="$GITHUB_HEAD_REF"
             type="pr"
             tag="pr${PR_NUMBER}.${GITHUB_HEAD_REF}"
           elif [[ "$GITHUB_REF" == refs/tags/* ]]; then
+            branch_ref="$GITHUB_REF"
             type="tag"
             tag="${GITHUB_REF#refs/tags/}"
           else
@@ -49,6 +51,7 @@ jobs:
           fi
           # Replace / with . in container tag names
           tag="${tag//\//.}"
+          echo "VERSION_BRANCH="${branch_ref}" >> $GITHUB_ENV
           echo "VERSION_TYPE=${type}" >> $GITHUB_ENV
           echo "VERSION_NAME=${tag}" >> $GITHUB_ENV
         id: extract_name
@@ -93,7 +96,7 @@ jobs:
             --arg version_name "$VERSION_NAME" \
             --arg revision     "$REVISION_TAG" \
             --arg release_time "$timestamp" \
-            --arg branch       "$GITHUB_REF" \
+            --arg branch       "$VERSION_BRANCH" \
             --arg digest       "$digest" \
             --arg api_version  "$api_version" \
             > "/tmp/$VERSION_NAME.json"