From b1c9d08435a5b7d7487b30bbf181cb48830c2458 Mon Sep 17 00:00:00 2001
From: tapframe <85391825+tapframe@users.noreply.github.com>
Date: Mon, 20 Jul 2026 19:30:51 +0530
Subject: [PATCH] fix(ci): target releases at selected branch

---
 .github/workflows/android-release.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/android-release.yml b/.github/workflows/android-release.yml
index 929c29e0b..e9dd9a557 100644
--- a/.github/workflows/android-release.yml
+++ b/.github/workflows/android-release.yml
@@ -48,12 +48,12 @@ jobs:
           RELEASE_TAG: ${{ steps.release.outputs.tag }}
           CURRENT_BUMP: ${{ steps.release.outputs.current_bump }}
           RELEASE_COMMIT: ${{ steps.release.outputs.release_commit }}
-          CURRENT_BRANCH: ${{ github.ref_name }}
-          DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
+          RELEASE_BRANCH: ${{ github.ref_name }}
+          RELEASE_REF_TYPE: ${{ github.ref_type }}
           RELEASE_MODE: ${{ inputs.mode }}
         run: |
-          if [[ "${CURRENT_BRANCH}" != "${DEFAULT_BRANCH}" ]]; then
-            echo "Releases must run from the default branch (${DEFAULT_BRANCH}), not ${CURRENT_BRANCH}." >&2
+          if [[ "${RELEASE_REF_TYPE}" != "branch" ]]; then
+            echo "Releases must be dispatched from a branch, not ${RELEASE_REF_TYPE}." >&2
             exit 1
           fi
 
@@ -173,7 +173,7 @@ jobs:
           RELEASE_MODE: ${{ inputs.mode }}
           RELEASE_TAG: ${{ steps.release.outputs.tag }}
           RELEASE_VERSION: ${{ steps.release.outputs.version }}
-          RELEASE_COMMIT: ${{ steps.release.outputs.release_commit }}
+          RELEASE_BRANCH: ${{ github.ref_name }}
         run: |
           mapfile -t release_apks < <(find androidApp/build/outputs/apk/full/release -maxdepth 1 -type f -name '*.apk' -print | sort)
           if (( ${#release_apks[@]} == 0 )); then
@@ -183,7 +183,7 @@ jobs:
 
           release_args=(
             "${RELEASE_TAG}"
-            --target "${RELEASE_COMMIT}"
+            --target "${RELEASE_BRANCH}"
             --title "${RELEASE_VERSION}"
             --notes-file release-notes.md
           )