From 88dbf424644e39c81ed1241e7dbc075fed5907df Mon Sep 17 00:00:00 2001
From: tianma-if <yingwaizhiying@gmail.com>
Date: Tue, 25 Aug 2026 19:35:08 +0800
Subject: [PATCH] fix(release): audit Draft APK from target commit

---
 .../android-play-signature-audit.yml          | 33 ++++++++++++-------
 scripts/store-delivery.test.mjs               |  5 ++-
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/android-play-signature-audit.yml b/.github/workflows/android-play-signature-audit.yml
index 7a5c8618..7c4f90dd 100644
--- a/.github/workflows/android-play-signature-audit.yml
+++ b/.github/workflows/android-play-signature-audit.yml
@@ -17,23 +17,32 @@ jobs:
     name: Require Play-signed Draft APK
     runs-on: ubuntu-latest
     steps:
-      - name: Check out the immutable Release tag
-        uses: actions/checkout@v5
-        with:
-          ref: ${{ inputs.release_tag }}
-          fetch-depth: 0
-
       - name: Validate matching Draft Release
+        id: release
         env:
           GH_TOKEN: ${{ github.token }}
           RELEASE_TAG: ${{ inputs.release_tag }}
         run: |
-          release="$(gh api "repos/${GITHUB_REPOSITORY}/releases/tags/${RELEASE_TAG}")"
-          test "$(jq -r '.draft' <<<"$release")" = "true"
-          test "$(jq -r '.prerelease' <<<"$release")" = "false"
-          test "$(jq -r '.tag_name' <<<"$release")" = "$RELEASE_TAG"
-          release_target="$(jq -r '.target_commitish' <<<"$release")"
-          test "$(git rev-parse "${RELEASE_TAG}^{commit}")" = "$(git rev-parse "${release_target}^{commit}")"
+          release="$(gh release view "$RELEASE_TAG" \
+            --repo "$GITHUB_REPOSITORY" \
+            --json isDraft,isPrerelease,tagName,targetCommitish)"
+          test "$(jq -r '.isDraft' <<<"$release")" = "true"
+          test "$(jq -r '.isPrerelease' <<<"$release")" = "false"
+          test "$(jq -r '.tagName' <<<"$release")" = "$RELEASE_TAG"
+          release_target="$(jq -r '.targetCommitish' <<<"$release")"
+          test -n "$release_target"
+          echo "target_commitish=$release_target" >> "$GITHUB_OUTPUT"
+
+      - name: Check out the immutable Draft target
+        uses: actions/checkout@v5
+        with:
+          ref: ${{ steps.release.outputs.target_commitish }}
+          fetch-depth: 0
+
+      - name: Verify the checked-out Draft target
+        env:
+          RELEASE_TARGET: ${{ steps.release.outputs.target_commitish }}
+        run: test "$(git rev-parse HEAD)" = "$(git rev-parse "${RELEASE_TARGET}^{commit}")"
 
       - name: Download the Draft Android APK
         env:
diff --git a/scripts/store-delivery.test.mjs b/scripts/store-delivery.test.mjs
index 70200f1e..6b8f0dc3 100644
--- a/scripts/store-delivery.test.mjs
+++ b/scripts/store-delivery.test.mjs
@@ -72,7 +72,10 @@ describe("store delivery command", () => {
     );
 
     expect(workflow).toContain("github.repository == 'tianma-if/edgeever'");
-    expect(workflow).toContain('test "$(jq -r \'.draft\' <<<"$release")" = "true"');
+    expect(workflow).toContain('gh release view "$RELEASE_TAG"');
+    expect(workflow).toContain('test "$(jq -r \'.isDraft\' <<<"$release")" = "true"');
+    expect(workflow).toContain("ref: ${{ steps.release.outputs.target_commitish }}");
+    expect(workflow).not.toContain("ref: ${{ inputs.release_tag }}");
     expect(workflow).toContain("EDGE_EVER_ANDROID_ALLOWED_SIGNER_SHA256: ${{ secrets.ANDROID_PLAY_APP_SIGNER_SHA256 }}");
     expect(workflow).not.toContain("22bf52a9501c89020f5acc966960152c826bfa64f31e578e858d088f8cd75d87");
   });