From 2f668a70dabc8f880cbe4885b21c5745597d0f7c Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Thu, 28 May 2026 02:11:44 +0000 Subject: [PATCH] fix(android): auto-load signing env inside sign-android-apk.sh sign-android-apk.sh now sources setup-android-signing.sh when WEB2APP_ANDROID_KEYSTORE is unset, so signing works even when the workflow invokes setup and sign as separate bash processes (e.g. CI re-runs of older workflow definitions). Co-authored-by: ShuMengya --- .github/scripts/sign-android-apk.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/scripts/sign-android-apk.sh b/.github/scripts/sign-android-apk.sh index 571969c..4528083 100644 --- a/.github/scripts/sign-android-apk.sh +++ b/.github/scripts/sign-android-apk.sh @@ -1,6 +1,13 @@ #!/usr/bin/env bash set -euo pipefail +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" + +if [ -z "${WEB2APP_ANDROID_KEYSTORE:-}" ]; then + # shellcheck source=setup-android-signing.sh + source "${SCRIPT_DIR}/setup-android-signing.sh" +fi + BUILD_TOOLS="${ANDROID_HOME}/build-tools/34.0.0" KEYSTORE="${WEB2APP_ANDROID_KEYSTORE:?Missing keystore}" STORE_PASS="${WEB2APP_ANDROID_STORE_PASS:?Missing store password}"