From 0ffd04c428c6e68e1b0e0bea093e56ab4c4c3fde Mon Sep 17 00:00:00 2001
From: Max <shadow.iqka@qq.com>
Date: Sun, 19 Apr 2026 18:18:07 +0800
Subject: [PATCH] fix(workflows): improve version and run ID resolution in
 notarization and release workflows

- Simplified version detection logic in the notarization workflow to prioritize the latest GitHub release.
- Enhanced error handling for cases where version or run ID cannot be determined.
- Updated the release workflow to ensure consistent version extraction from the upstream branch or fallback to the latest release.
---
 .github/workflows/notarize-macos.yml | 34 +++++++++++++++-------------
 .github/workflows/release.yml        | 11 ++++++++-
 2 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/notarize-macos.yml b/.github/workflows/notarize-macos.yml
index 25f7ac1b..76d666d9 100644
--- a/.github/workflows/notarize-macos.yml
+++ b/.github/workflows/notarize-macos.yml
@@ -18,7 +18,7 @@ permissions:
   actions: write
 
 concurrency:
-  group: notarize-${{ github.event.workflow_run.head_branch || github.run_id }}
+  group: notarize-${{ github.run_id }}
   cancel-in-progress: true
 
 jobs:
@@ -29,8 +29,7 @@ jobs:
     runs-on: ubuntu-latest
     if: >
       github.event_name == 'workflow_dispatch' ||
-      (github.event.workflow_run.conclusion == 'success' &&
-       startsWith(github.event.workflow_run.head_branch, 'v'))
+      github.event.workflow_run.conclusion == 'success'
     outputs:
       version: ${{ steps.resolve.outputs.version }}
       run_id: ${{ steps.resolve.outputs.run_id }}
@@ -43,21 +42,24 @@ jobs:
           if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
             VERSION="${{ github.event.inputs.version }}"
             RUN_ID="${{ github.event.inputs.run_id }}"
-            if [ -z "$VERSION" ]; then
-              TAG=$(gh release view --repo "$GITHUB_REPOSITORY" --json tagName -q '.tagName')
-              VERSION="${TAG#v}"
-            fi
-            if [ -z "$RUN_ID" ]; then
-              RUN_ID=$(gh run list --repo "$GITHUB_REPOSITORY" \
-                --workflow="Release macOS" --branch="v${VERSION}" --limit=1 \
-                --json databaseId --jq '.[0].databaseId')
-            fi
-          else
-            TAG="${{ github.event.workflow_run.head_branch }}"
+          fi
+
+          # Auto-detect version from latest GitHub Release
+          if [ -z "$VERSION" ]; then
+            TAG=$(gh release view --repo "$GITHUB_REPOSITORY" --json tagName -q '.tagName')
             VERSION="${TAG#v}"
+          fi
+
+          if [ -z "$VERSION" ]; then
+            echo "::error::Could not determine version from latest release"
+            exit 1
+          fi
+
+          # Auto-detect macOS build run_id
+          if [ -z "$RUN_ID" ]; then
             RUN_ID=$(gh run list --repo "$GITHUB_REPOSITORY" \
-              --workflow="Release macOS" --branch="${TAG}" --limit=1 \
-              --json databaseId --jq '.[0].databaseId')
+              --workflow="Release macOS" --branch="v${VERSION}" --limit=1 \
+              --json databaseId,conclusion --jq '.[] | select(.conclusion=="success") | .databaseId')
           fi
 
           if [ -z "$VERSION" ] || [ -z "$RUN_ID" ]; then
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 9c76df80..0bd5504c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -24,9 +24,18 @@ jobs:
 
       - name: Get Version
         id: version
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
+          # Prefer head_branch from upstream (works for first-level workflow_run)
           TAG="${{ github.event.workflow_run.head_branch }}"
-          VERSION="${TAG#v}"
+          if [[ "$TAG" =~ ^v ]]; then
+            VERSION="${TAG#v}"
+          else
+            # Fallback: get from latest GitHub Release
+            TAG=$(gh release view --repo "$GITHUB_REPOSITORY" --json tagName -q '.tagName')
+            VERSION="${TAG#v}"
+          fi
           echo "version=${VERSION}" >> $GITHUB_OUTPUT
           echo "tag=${TAG}" >> $GITHUB_OUTPUT
           echo "TAG=${TAG} VERSION=${VERSION}"