diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml index a93131f..322a88e 100644 --- a/.github/workflows/build-android.yml +++ b/.github/workflows/build-android.yml @@ -230,6 +230,11 @@ jobs: - name: Build the Android APK shell: bash + env: + ANDROID_KEYSTORE_BASE64: ${{ secrets.ANDROID_KEYSTORE_BASE64 }} + ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }} + ANDROID_KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }} + ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD }} run: | set -euo pipefail # download-sdk.sh unpacks the SDK under android/buildscripts/sdk; find @@ -271,18 +276,29 @@ jobs: mkdir -p "$sdk_dir/ndk" ln -sfn "$ndk" "$sdk_dir/ndk/${ndk_revision:-$v_ndk}" fi - # A throwaway key keeps the artifact installable; replace it with a - # repository secret when the build should be signed for distribution. - keytool -genkeypair -noprompt -keystore "$GITHUB_WORKSPACE/ci-signing.jks" \ - -storepass android -keypass android -alias androiddebugkey \ - -keyalg RSA -keysize 2048 -validity 10000 \ - -dname "CN=mpv-joc CI, O=mpv-joc, C=CN" + # The release key is a repository secret, so every build has the + # same signature and an APK can be installed over the previous one. + if [ -z "${ANDROID_KEYSTORE_BASE64:-}" ] || \ + [ -z "${ANDROID_KEYSTORE_PASSWORD:-}" ] || \ + [ -z "${ANDROID_KEY_ALIAS:-}" ] || \ + [ -z "${ANDROID_KEY_PASSWORD:-}" ]; then + echo "::error::Android signing secrets are missing. Set ANDROID_KEYSTORE_BASE64, ANDROID_KEYSTORE_PASSWORD, ANDROID_KEY_ALIAS and ANDROID_KEY_PASSWORD." + exit 1 + fi + keystore="$RUNNER_TEMP/mpv-joc-release.jks" + trap 'rm -f "$keystore"' EXIT + printf '%s' "$ANDROID_KEYSTORE_BASE64" | base64 -d > "$keystore" + chmod 600 "$keystore" + keytool -list -keystore "$keystore" \ + -storepass "$ANDROID_KEYSTORE_PASSWORD" \ + -alias "$ANDROID_KEY_ALIAS" >/dev/null cd "$GITHUB_WORKSPACE/android" ./gradlew --no-daemon --stacktrace assembleRelease \ - -Pandroid.injected.signing.store.file="$GITHUB_WORKSPACE/ci-signing.jks" \ - -Pandroid.injected.signing.store.password=android \ - -Pandroid.injected.signing.key.alias=androiddebugkey \ - -Pandroid.injected.signing.key.password=android + -Pandroid.injected.signing.store.file="$keystore" \ + -Pandroid.injected.signing.store.type=PKCS12 \ + -Pandroid.injected.signing.store.password="$ANDROID_KEYSTORE_PASSWORD" \ + -Pandroid.injected.signing.key.alias="$ANDROID_KEY_ALIAS" \ + -Pandroid.injected.signing.key.password="$ANDROID_KEY_PASSWORD" - name: Collect the APK shell: bash diff --git a/.gitignore b/.gitignore index 55eb52f..50963d4 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,8 @@ dist/ *.log *.log.1 *.zip +*.jks +*.keystore *.wav HRTF/ *.sofa diff --git a/fork/docs/android.md b/fork/docs/android.md index ab11694..2de81b3 100644 --- a/fork/docs/android.md +++ b/fork/docs/android.md @@ -71,10 +71,43 @@ × `arm64-v8a` / `universal` 四个包,CI 只保留 allstorage 的 universal 版:权限最全, ABI 拆包也不会让工件变多。 -签名用的是 CI 现场生成的临时 keystore(`-Pandroid.injected.signing.*`),只保证可安装, -不代表发布身份;要正式分发就把这段换成仓库 secret 里的 keystore。APK 里仍是原版 -mpv-android 界面,`--ad=joc`、`--ad-joc-hrtf=` 等参数要在应用能读到的 `mpv.conf` -里给出,HRTF 文件也要放在应用可访问的目录。 +APK 使用仓库 secret 里的固定 release keystore 签名。只要包名不变、签名相同,新 APK 就能 +直接覆盖安装,不需要先卸载。签名密钥丢失后无法再覆盖安装,必须卸载旧版,所以 keystore +和密码要单独备份。 + +### 固定签名的一次性设置 + +在本机生成 release keystore(`keytool` 来自 JDK;建议 PKCS12): + +```powershell +keytool -genkeypair -v -storetype PKCS12 ` + -keystore "$env:USERPROFILE\mpv-joc-release.jks" ` + -alias mpv-joc -keyalg RSA -keysize 4096 -validity 10000 +``` + +把 keystore 转成单行 Base64 并复制: + +```powershell +[Convert]::ToBase64String( + [IO.File]::ReadAllBytes("$env:USERPROFILE\mpv-joc-release.jks") +) | Set-Clipboard +``` + +在 GitHub 仓库的 **Settings → Secrets and variables → Actions** 添加四个 secret: + +| Secret | 内容 | +|---|---| +| `ANDROID_KEYSTORE_BASE64` | 上面复制的 Base64 字符串 | +| `ANDROID_KEYSTORE_PASSWORD` | keystore 密码 | +| `ANDROID_KEY_ALIAS` | `mpv-joc` | +| `ANDROID_KEY_PASSWORD` | key 密码;PKCS12 通常与 keystore 密码相同 | + +`build-android.yml` 在构建时把 Base64 解码到 `$RUNNER_TEMP`,用 +`-Pandroid.injected.signing.*` 交给 Gradle,构建结束后删除临时 keystore。secret +缺失时任务会直接失败,不会退回临时 key。 + +APK 里仍是原版 mpv-android 界面,`--ad=joc`、`--ad-joc-hrtf=` 等参数要在应用能读到的 +`mpv.conf` 里给出,HRTF 文件也要放在应用可访问的目录。 ## 参考