From e53425b481f254442a7b9ba165e81dd46ce510c8 Mon Sep 17 00:00:00 2001
From: VaalaCat <me@vaala.cat>
Date: Fri, 2 Jan 2026 14:36:31 +0000
Subject: [PATCH] fix: build version tag

---
 .github/workflows/tag.workflow.yml                | 7 ++-----
 .github/workflows/workerd-docker-tag.workflow.yml | 5 +----
 build.sh                                          | 4 ++++
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/tag.workflow.yml b/.github/workflows/tag.workflow.yml
index d2123b3..8075a3c 100644
--- a/.github/workflows/tag.workflow.yml
+++ b/.github/workflows/tag.workflow.yml
@@ -8,9 +8,6 @@ jobs:
   build-static:
     runs-on: ubuntu-latest
     steps:
-      - name: Get version
-        id: get_version
-        run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
@@ -40,7 +37,7 @@ jobs:
         with:
           repo_token: "${{ secrets.GITHUB_TOKEN }}"
           prerelease: false
-          automatic_release_tag: ${{ steps.get_version.outputs.VERSION }}
+          automatic_release_tag: ${{ github.ref_name }}
           files: |
             dist/*
       - name: Latest Release
@@ -61,5 +58,5 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
         run: |
           echo "${password}" | ko login docker.io --username ${username} --password-stdin
-          ko build ./cmd/frpp --sbom=none --bare -t ${{ steps.get_version.outputs.VERSION }}
+          ko build ./cmd/frpp --sbom=none --bare -t ${{ github.ref_name }}
           ko build ./cmd/frpp --sbom=none --bare -t latest
\ No newline at end of file
diff --git a/.github/workflows/workerd-docker-tag.workflow.yml b/.github/workflows/workerd-docker-tag.workflow.yml
index 58e83ba..75f1643 100644
--- a/.github/workflows/workerd-docker-tag.workflow.yml
+++ b/.github/workflows/workerd-docker-tag.workflow.yml
@@ -8,9 +8,6 @@ jobs:
   build-static:
     runs-on: ubuntu-latest
     steps:
-      - name: Get version
-        id: get_version
-        run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
@@ -46,5 +43,5 @@ jobs:
         run: |
           mv .ko.workerd.yaml .ko.yaml
           echo "${password}" | ko login docker.io --username ${username} --password-stdin
-          ko build ./cmd/frpp --sbom=none --bare -t ${{ steps.get_version.outputs.VERSION }}-workerd
+          ko build ./cmd/frpp --sbom=none --bare -t ${{ github.ref_name }}-workerd
           ko build ./cmd/frpp --sbom=none --bare -t latest-workerd
diff --git a/build.sh b/build.sh
index 678bea4..02b3368 100755
--- a/build.sh
+++ b/build.sh
@@ -21,6 +21,10 @@ GIT_COMMIT="$(git rev-parse HEAD)"
 VERSION="$(git describe --tags --abbrev=0 | tr -d '\n')"
 GIT_BRANCH="$(git rev-parse --abbrev-ref HEAD)"
 
+if [[ -n "$GITHUB_REF_NAME" ]]; then
+    VERSION="$GITHUB_REF_NAME"
+fi
+
 # Parse arguments
 while [[ "$#" -gt 0 ]]; do
     case $1 in