From 74c8980edc199a21c66bb7c5131599a03d044be2 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Mon, 27 Oct 2025 14:23:05 +1100
Subject: [PATCH] branch name use and extraction fixes, limit validation to
 main branch

---
 .github/scripts/extract_version.sh   | 4 +++-
 .github/workflows/docker-release.yml | 8 +++++++-
 .github/workflows/github-release.yml | 7 +++++--
 .github/workflows/validation.yml     | 2 ++
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/.github/scripts/extract_version.sh b/.github/scripts/extract_version.sh
index 3e7b124..f37604a 100755
--- a/.github/scripts/extract_version.sh
+++ b/.github/scripts/extract_version.sh
@@ -62,7 +62,9 @@ else
     BRANCH_NAME="$1"
 
     # Extract version from branch name (release/1.2.3 -> 1.2.3)
-    BRANCH_VERSION="${BRANCH_NAME#release/}"
+    # Also strip refs/heads/ if present (from github.ref)
+    BRANCH_VERSION="${BRANCH_NAME#refs/heads/}"
+    BRANCH_VERSION="${BRANCH_VERSION#release/}"
     echo "Branch version: $BRANCH_VERSION"
     echo ""
 
diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml
index 8f0b7ef..5c4187b 100644
--- a/.github/workflows/docker-release.yml
+++ b/.github/workflows/docker-release.yml
@@ -4,11 +4,15 @@ on:
   push:
     branches:
       - 'release/**'
+  workflow_dispatch:
 
 permissions:
   contents: write
   packages: write
 
+env:
+  CURRENT_BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
+
 jobs:
   extract-version:
     name: Extract Version
@@ -20,12 +24,14 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v5
+        with:
+          token: ${{ secrets.PUBLISHER_TOKEN }}
 
       - name: Extract version from branch and version.py
         id: extract
         run: |
           # Extract version from branch name and validate against version.py
-          .github/scripts/extract_version.sh "${{ github.ref }}"
+          .github/scripts/extract_version.sh "$CURRENT_BRANCH_NAME"
 
       - name: Validate version format
         run: |
diff --git a/.github/workflows/github-release.yml b/.github/workflows/github-release.yml
index 3f218ac..eb653d6 100644
--- a/.github/workflows/github-release.yml
+++ b/.github/workflows/github-release.yml
@@ -12,6 +12,9 @@ on:
 permissions:
   contents: write
 
+env:
+  CURRENT_BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
+
 jobs:
   create-github-release:
     name: Create GitHub Release
@@ -24,12 +27,12 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v5
         with:
-          ref: ${{ github.event.workflow_run.head_branch }}
+          ref: $CURRENT_BRANCH_NAME
           fetch-depth: 0
 
       - name: Extract version from branch
         id: extract
-        run: .github/scripts/extract_version.sh "${{ github.event.workflow_run.head_branch }}"
+        run: .github/scripts/extract_version.sh "$CURRENT_BRANCH_NAME"
 
       - name: Validate version format
         id: validate
diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml
index c056490..72247ae 100644
--- a/.github/workflows/validation.yml
+++ b/.github/workflows/validation.yml
@@ -2,6 +2,8 @@ name: validation
 
 on:
   push:
+    branches:
+      - main
   pull_request:
   workflow_dispatch: