From b8ac68b36331826e58dde1f799bfed55c4bf9ee9 Mon Sep 17 00:00:00 2001 From: nick Date: Mon, 21 Sep 2026 18:02:14 +1200 Subject: [PATCH] ci: use a Trafero-specific persistent CI keystore path The runner cache already held a release.jks minted by another project with a different store password, so packageRelease failed with "keystore password was incorrect". Mint and reuse trafero-release.jks instead. --- .gitea/workflows/release.yml | 20 +++++++++++--------- keystore/README.md | 8 +++++--- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 239207d..0acca09 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -82,25 +82,27 @@ jobs: git checkout "$RELEASE_TAG" # Persistent signing keystore: minted ONCE in the runner's # cache dir (which survives across runs, same place the JDK - # and SDK live) and copied into the checkout. Every release - # is therefore signed with the SAME key, so users can - # upgrade in place instead of hitting a signature conflict. - # A runner-host rebuild would mint a fresh key — the only - # scenario that breaks one upgrade. + # and SDK live) and copied into the checkout. Trafero uses its + # OWN file (trafero-release.jks) - the shared release.jks there + # was minted by another project with a different password. + # Every release is therefore signed with the SAME key, so + # users can upgrade in place instead of hitting a signature + # conflict. A runner-host rebuild would mint a fresh key - the + # only scenario that breaks one upgrade. mkdir -p keystore - if [ ! -f /var/lib/gitea-runner/work/release.jks ]; then + if [ ! -f /var/lib/gitea-runner/work/trafero-release.jks ]; then echo "Minting new persistent CI keystore" keytool -genkey -noprompt -v \ - -keystore /var/lib/gitea-runner/work/release.jks \ + -keystore /var/lib/gitea-runner/work/trafero-release.jks \ -keyalg RSA -keysize 2048 -validity 10000 \ -alias trafero \ -storepass trafero_dev_keystore \ -keypass trafero_dev_keystore \ - -dname "CN=Trafero Dev, OU=Local, O=Trafero, L=Local, ST=Local, C=NZ" + -dname "CN=Trafero CI, OU=Local, O=Trafero, L=Local, ST=Local, C=NZ" else echo "Reusing persistent CI keystore from runner cache" fi - cp /var/lib/gitea-runner/work/release.jks keystore/release.jks + cp /var/lib/gitea-runner/work/trafero-release.jks keystore/release.jks export JAVA_HOME=/var/lib/gitea-runner/work/jdk export ANDROID_HOME=/var/lib/gitea-runner/work/android-sdk export PATH=$JAVA_HOME/bin:$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-tools:$PATH diff --git a/keystore/README.md b/keystore/README.md index d1abc8a..26baed4 100644 --- a/keystore/README.md +++ b/keystore/README.md @@ -25,9 +25,11 @@ before publishing anywhere real. ## CI (Gitea Actions) `release.yml` mints one persistent keystore on the runner at -`/var/lib/gitea-runner/work/release.jks` (same parameters as above) and -copies it to `keystore/release.jks` for every build, so all CI release -APKs share one signing key and users can upgrade in place. +`/var/lib/gitea-runner/work/trafero-release.jks` (same parameters as +above, except `CN=Trafero CI`) and copies it to `keystore/release.jks` +for every build, so all CI release APKs share one signing key and users +can upgrade in place. The file is project-specific (`trafero-` prefix) +because the runner cache directory is shared between repositories. **Important:** locally-built (and debug) APKs have a *different* signature from CI release APKs — installing a CI release build over a