From cddcf99873e58c3f1a320afaf07b6757e362ad52 Mon Sep 17 00:00:00 2001
From: Micheal Wilkinson <micheal.wilkinson@createfuture.com>
Date: Sat, 21 Mar 2026 15:40:16 +0000
Subject: [PATCH] fix(release): resolve version before publish to support
 workflow_call context

---
 .gitea/workflows/do-release.yml | 53 +++++++++++++++++++++++----------
 publish/action.yml              |  1 +
 2 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/.gitea/workflows/do-release.yml b/.gitea/workflows/do-release.yml
index 956d0d9..be01cfe 100644
--- a/.gitea/workflows/do-release.yml
+++ b/.gitea/workflows/do-release.yml
@@ -31,18 +31,46 @@ jobs:
       RELEASE_TOKEN: ${{ secrets.GITHUB_TOKEN || secrets.GITEA_TOKEN }}
       SUMMARY_FILE: ${{ runner.temp }}/do-release-summary.md
     steps:
-      - name: Checkout tagged revision
+      - name: Checkout
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-          ref: ${{ github.ref }}
 
-      - name: Checkout requested tag
-        if: ${{ inputs.tag != '' }}
+      - name: Resolve release version
+        id: resolve-version
+        env:
+          REQUESTED_TAG: ${{ inputs.tag }}
+        run: |
+          set -euo pipefail
+
+          requested_tag="$(printf '%s' "${REQUESTED_TAG:-}" | sed 's/^[[:space:]]\+//; s/[[:space:]]\+$//')"
+          
+          if [[ -n "$requested_tag" ]]; then
+            # Explicit tag was provided
+            normalized="${requested_tag#v}"
+            tag="v${normalized}"
+          elif [[ "$GITHUB_REF" == refs/tags/* ]]; then
+            # Running from a tag push
+            tag="${GITHUB_REF#refs/tags/}"
+            normalized="${tag#v}"
+          elif tag_at_head="$(git describe --exact-match --tags HEAD 2>/dev/null)" && [[ -n "$tag_at_head" ]]; then
+            # Current HEAD is at a tag
+            tag="$tag_at_head"
+            normalized="${tag#v}"
+          else
+            echo "A release tag is required when the workflow is not running from a tag push" >&2
+            echo "Provide a tag via the 'tag' input or ensure HEAD is at a tagged commit." >&2
+            exit 1
+          fi
+
+          echo "tag=${tag}" >> "$GITHUB_OUTPUT"
+          echo "version=${normalized}" >> "$GITHUB_OUTPUT"
+
+      - name: Checkout release tag
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-          ref: ${{ startsWith(inputs.tag, 'v') && format('refs/tags/{0}', inputs.tag) || format('refs/tags/v{0}', inputs.tag) }}
+          ref: refs/tags/${{ steps.resolve-version.outputs.tag }}
 
       - name: Setup Go
         uses: actions/setup-go@v5
@@ -54,7 +82,7 @@ jobs:
 
       - name: Preflight release API access
         env:
-          REQUESTED_TAG: ${{ inputs.tag }}
+          TAG_NAME: ${{ steps.resolve-version.outputs.tag }}
         run: |
           set -euo pipefail
 
@@ -76,14 +104,9 @@ jobs:
             -H "Content-Type: application/json" \
             "${repo_api}/releases?limit=1" >/dev/null
 
-          requested_tag="$(printf '%s' "${REQUESTED_TAG:-}" | sed 's/^[[:space:]]\+//; s/[[:space:]]\+$//')"
-          if [[ -n "$requested_tag" ]]; then
-            normalized_tag="${requested_tag#v}"
-            tag_ref="refs/tags/v${normalized_tag}"
-            if ! git rev-parse --verify --quiet "$tag_ref" >/dev/null; then
-              echo "Requested tag ${tag_ref#refs/tags/} was not found in the checked out repository." >&2
-              exit 1
-            fi
+          if ! git rev-parse --verify --quiet "refs/tags/${TAG_NAME}" >/dev/null; then
+            echo "Tag ${TAG_NAME} was not found in the checked out repository." >&2
+            exit 1
           fi
 
       - name: Create or update release
@@ -91,7 +114,7 @@ jobs:
         uses: ./publish
         with:
           token: ${{ secrets.GITHUB_TOKEN || secrets.GITEA_TOKEN }}
-          version: ${{ inputs.tag }}
+          version: ${{ steps.resolve-version.outputs.version }}
 
       - name: Build release binaries
         env:
diff --git a/publish/action.yml b/publish/action.yml
index 2af2ea6..e3ab16c 100644
--- a/publish/action.yml
+++ b/publish/action.yml
@@ -57,6 +57,7 @@ runs:
           normalized="${tag#v}"
         else
           echo "A version input is required when the workflow is not running from a tag push" >&2
+          echo "Provide version via input or ensure HEAD is at a tagged commit." >&2
           exit 1
         fi