From d1b00d6ff31185c382b250fa799e0b119235ead7 Mon Sep 17 00:00:00 2001
From: wgqqqqq <wgq0617@gmail.com>
Date: Fri, 31 Jul 2026 15:59:23 +0800
Subject: [PATCH] fix(release): install minisign CLI fallback

---
 .github/workflows/ci.yml              | 16 ++++++++
 .github/workflows/desktop-package.yml |  3 --
 .github/workflows/nightly.yml         |  3 --
 scripts/sign-release-assets.sh        | 56 ++++++++++++++++++++++-----
 4 files changed, 62 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a2a5963c3..6a7c6209b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -53,6 +53,22 @@ jobs:
           done < <(git ls-files -z '*.sh' '*.bash')
           exit "$rc"
 
+      - name: Verify minisign download fallback
+        run: |
+          set -euo pipefail
+          test_root="$(mktemp -d)"
+          trap 'rm -rf "$test_root"' EXIT
+          mkdir -p "$test_root/stubs"
+          printf '#!/usr/bin/env bash\nexit 1\n' >"$test_root/stubs/sudo"
+          chmod +x "$test_root/stubs/sudo"
+
+          PATH="$test_root/stubs:/usr/bin:/bin" \
+            RUNNER_TEMP="$test_root" \
+            BITFUN_SIGNING_KEY="YQ==" \
+            bash scripts/sign-release-assets.sh "$test_root/missing-asset"
+
+          "$test_root/bitfun-minisign-0.12/bin/minisign" -v
+
   # ── CLI: independent tests ─────────────────────────────────────────
   cli-test:
     name: CLI Tests (${{ matrix.os }})
diff --git a/.github/workflows/desktop-package.yml b/.github/workflows/desktop-package.yml
index 9d79add20..37e3d77a3 100644
--- a/.github/workflows/desktop-package.yml
+++ b/.github/workflows/desktop-package.yml
@@ -322,9 +322,6 @@ jobs:
             --repo "GCWing/BitFun" \
             --out linux-release-assets/linux-binaries.json
 
-      - name: Setup Rust toolchain (minisign fallback)
-        uses: dtolnay/rust-toolchain@stable
-
       # The Tauri bundler signs the five updater artifacts during `tauri build`,
       # but the installers people download by hand from the release page — dmg,
       # deb, rpm, the Windows installer and the direct AppImages — shipped with
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 6bd81dc90..fbcaed348 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -319,9 +319,6 @@ jobs:
             --repo "GCWing/BitFun" \
             --out linux-release-assets/linux-binaries.json
 
-      - name: Setup Rust toolchain (minisign fallback)
-        uses: dtolnay/rust-toolchain@stable
-
       # The Tauri bundler signs the five updater artifacts during `tauri build`,
       # but the installers people download by hand from the release page — dmg,
       # deb, rpm, the Windows installer and the direct AppImages — shipped with
diff --git a/scripts/sign-release-assets.sh b/scripts/sign-release-assets.sh
index 4a6e04c85..f09471165 100755
--- a/scripts/sign-release-assets.sh
+++ b/scripts/sign-release-assets.sh
@@ -34,17 +34,53 @@ fi
 
 if ! command -v minisign >/dev/null 2>&1; then
   echo "[sign] Installing minisign..."
-  # Ubuntu's package is not available in the default repositories on every
-  # runner image (notably ubuntu-24.04-arm). Prefer it when present, then use
-  # the portable Rust distribution as a fallback.
-  if ! sudo apt-get install -y --no-install-recommends minisign >/dev/null 2>&1; then
-    if ! command -v cargo >/dev/null 2>&1; then
-      echo "[sign] ERROR: minisign is unavailable and cargo is not installed." >&2
+  case "$(uname -s)" in
+    Linux)
+      # Ubuntu's package is not available on every runner image, notably ARM.
+      if ! command -v sudo >/dev/null 2>&1 ||
+        ! sudo apt-get install -y --no-install-recommends minisign >/dev/null 2>&1; then
+        MINISIGN_VERSION="0.12"
+        MINISIGN_ARCHIVE_SHA256="9a599b48ba6eb7b1e80f12f36b94ceca7c00b7a5173c95c3efc88d9822957e73"
+        case "$(uname -m)" in
+          x86_64 | amd64)
+            MINISIGN_ARCH="x86_64"
+            ;;
+          aarch64 | arm64)
+            MINISIGN_ARCH="aarch64"
+            ;;
+          *)
+            echo "[sign] ERROR: unsupported Linux architecture: $(uname -m)" >&2
+            exit 1
+            ;;
+        esac
+
+        MINISIGN_ROOT="${RUNNER_TEMP:-${TMPDIR:-/tmp}}/bitfun-minisign-${MINISIGN_VERSION}"
+        MINISIGN_ARCHIVE="$MINISIGN_ROOT/minisign-linux.tar.gz"
+        mkdir -p "$MINISIGN_ROOT/bin"
+        curl --fail --location --retry 3 \
+          "https://github.com/jedisct1/minisign/releases/download/${MINISIGN_VERSION}/minisign-${MINISIGN_VERSION}-linux.tar.gz" \
+          --output "$MINISIGN_ARCHIVE"
+        printf '%s  %s\n' "$MINISIGN_ARCHIVE_SHA256" "$MINISIGN_ARCHIVE" | sha256sum --check --status
+        tar -xzf "$MINISIGN_ARCHIVE" -C "$MINISIGN_ROOT/bin" \
+          --strip-components=2 "minisign-linux/${MINISIGN_ARCH}/minisign"
+        export PATH="$MINISIGN_ROOT/bin:$PATH"
+      fi
+      ;;
+    Darwin)
+      if ! command -v brew >/dev/null 2>&1 || ! brew install minisign >/dev/null; then
+        echo "[sign] ERROR: minisign is unavailable and Homebrew could not install it." >&2
+        exit 1
+      fi
+      ;;
+    *)
+      echo "[sign] ERROR: automatic minisign installation is unsupported on $(uname -s)." >&2
       exit 1
-    fi
-    MINISIGN_ROOT="${RUNNER_TEMP:-${TMPDIR:-/tmp}}/bitfun-minisign"
-    cargo install --registry crates-io --locked --root "$MINISIGN_ROOT" minisign >/dev/null
-    export PATH="$MINISIGN_ROOT/bin:$PATH"
+      ;;
+  esac
+
+  if ! command -v minisign >/dev/null 2>&1; then
+    echo "[sign] ERROR: minisign installation completed without a usable binary." >&2
+    exit 1
   fi
 fi