From 847d8edfb861dfa05502d4abf86d8c038a5e96c1 Mon Sep 17 00:00:00 2001
From: Toan Nguyen <hgiasac@gmail.com>
Date: Tue, 16 Apr 2024 00:57:04 +0700
Subject: [PATCH] fix build-manifest scripts

---
 .github/workflows/release.yaml | 6 +++++-
 scripts/build-manifest.sh      | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index e24025a..6b18eea 100644
--- 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
index 8ba0a75..192a0b4 100755
--- 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)"