fix build-manifest scripts

hasura · Apr 15, 2024 · 847d8ed · 847d8ed
1 parent e108c01
commit 847d8ed
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -35,7 +35,11 @@ jobs:
       - name: Get version from tag
         id: get-version
         run: |
-          echo "tagged_version=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
+          if [[ "$GITHUB_REF_TYPE" == 'tag' ]]; then
+            echo "tagged_version=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
+          else
+            echo "tagged_version=${GITHUB_REF#refs/heads/}" >> $GITHUB_OUTPUT
+          fi
         shell: bash
 
       - name: Extract metadata (tags, labels) for Docker

diff --git a/scripts/build-manifest.sh b/scripts/build-manifest.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -evo pipefail
 
-REF="${$(git rev-parse --short HEAD)#refs/heads/}"
+REF="$(git rev-parse --short HEAD)"
 VERSION=${VERSION:-$REF}
 BUILD_DIR=/tmp/ndc-stripe
 ROOT="$(pwd)"