From 2bb6fbbc25469590b3f0ea4e230d2afa0c535f25 Mon Sep 17 00:00:00 2001
From: chris <chris@chrisedwards.tech>
Date: Thu, 15 Oct 2026 11:17:35 -0400
Subject: [PATCH] CI: use the MUSICSHARE_UPLOAD_* secret names, like
 gradle.properties

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 .gitea/workflows/android.yml | 16 ++++++++--------
 docs/ANDROID-CI.md           |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.gitea/workflows/android.yml b/.gitea/workflows/android.yml
index 5707485..bace5a8 100644
--- a/.gitea/workflows/android.yml
+++ b/.gitea/workflows/android.yml
@@ -8,7 +8,7 @@
 # Uses only `run` steps (no third-party actions), inside the image from deploy/android-builder.
 # Secrets (repo Settings > Actions > Secrets):
 #   UPLOAD_KEYSTORE_BASE64  the upload keystore, base64 -w0
-#   UPLOAD_STORE_PASSWORD, UPLOAD_KEY_ALIAS, UPLOAD_KEY_PASSWORD
+#   MUSICSHARE_UPLOAD_STORE_PASSWORD, MUSICSHARE_UPLOAD_KEY_ALIAS, MUSICSHARE_UPLOAD_KEY_PASSWORD
 #   RELEASE_TOKEN           an access token with write:repository and write:package
 name: Android
 
@@ -61,9 +61,9 @@ jobs:
         env:
           KEYSTORE: ${{ secrets.UPLOAD_KEYSTORE_BASE64 }}
           ORG_GRADLE_PROJECT_MUSICSHARE_UPLOAD_STORE_FILE: /tmp/upload.keystore
-          ORG_GRADLE_PROJECT_MUSICSHARE_UPLOAD_STORE_PASSWORD: ${{ secrets.UPLOAD_STORE_PASSWORD }}
-          ORG_GRADLE_PROJECT_MUSICSHARE_UPLOAD_KEY_ALIAS: ${{ secrets.UPLOAD_KEY_ALIAS }}
-          ORG_GRADLE_PROJECT_MUSICSHARE_UPLOAD_KEY_PASSWORD: ${{ secrets.UPLOAD_KEY_PASSWORD }}
+          ORG_GRADLE_PROJECT_MUSICSHARE_UPLOAD_STORE_PASSWORD: ${{ secrets.MUSICSHARE_UPLOAD_STORE_PASSWORD }}
+          ORG_GRADLE_PROJECT_MUSICSHARE_UPLOAD_KEY_ALIAS: ${{ secrets.MUSICSHARE_UPLOAD_KEY_ALIAS }}
+          ORG_GRADLE_PROJECT_MUSICSHARE_UPLOAD_KEY_PASSWORD: ${{ secrets.MUSICSHARE_UPLOAD_KEY_PASSWORD }}
           REQUIRE_SIGNED: '1'
         run: |
           printf '%s' "$KEYSTORE" | base64 -d > /tmp/upload.keystore
@@ -71,16 +71,16 @@ jobs:
           # Check the signing secrets up front (without printing them) rather than 15 minutes in.
           missing=
           [ -n "$KEYSTORE" ] || missing="$missing UPLOAD_KEYSTORE_BASE64"
-          [ -n "$ORG_GRADLE_PROJECT_MUSICSHARE_UPLOAD_STORE_PASSWORD" ] || missing="$missing UPLOAD_STORE_PASSWORD"
-          [ -n "$ORG_GRADLE_PROJECT_MUSICSHARE_UPLOAD_KEY_ALIAS" ] || missing="$missing UPLOAD_KEY_ALIAS"
-          [ -n "$ORG_GRADLE_PROJECT_MUSICSHARE_UPLOAD_KEY_PASSWORD" ] || missing="$missing UPLOAD_KEY_PASSWORD"
+          [ -n "$ORG_GRADLE_PROJECT_MUSICSHARE_UPLOAD_STORE_PASSWORD" ] || missing="$missing MUSICSHARE_UPLOAD_STORE_PASSWORD"
+          [ -n "$ORG_GRADLE_PROJECT_MUSICSHARE_UPLOAD_KEY_ALIAS" ] || missing="$missing MUSICSHARE_UPLOAD_KEY_ALIAS"
+          [ -n "$ORG_GRADLE_PROJECT_MUSICSHARE_UPLOAD_KEY_PASSWORD" ] || missing="$missing MUSICSHARE_UPLOAD_KEY_PASSWORD"
           if [ -n "$missing" ]; then
             echo "These secrets are empty or missing (repo Settings > Actions > Secrets, not Variables):$missing" >&2
             exit 1
           fi
           if ! keytool -list -keystore /tmp/upload.keystore -storepass "$ORG_GRADLE_PROJECT_MUSICSHARE_UPLOAD_STORE_PASSWORD" \
               -alias "$ORG_GRADLE_PROJECT_MUSICSHARE_UPLOAD_KEY_ALIAS" >/dev/null; then
-            echo "The keystore didn't open: check UPLOAD_KEYSTORE_BASE64, UPLOAD_STORE_PASSWORD and UPLOAD_KEY_ALIAS." >&2
+            echo "The keystore didn't open: check UPLOAD_KEYSTORE_BASE64, MUSICSHARE_UPLOAD_STORE_PASSWORD and MUSICSHARE_UPLOAD_KEY_ALIAS." >&2
             exit 1
           fi
           apps/mobile/scripts/build-android.sh "$PWD/out"
diff --git a/docs/ANDROID-CI.md b/docs/ANDROID-CI.md
index 0e0bfe5..4b4ee5d 100644
--- a/docs/ANDROID-CI.md
+++ b/docs/ANDROID-CI.md
@@ -52,7 +52,7 @@ server, including databases, stops writing.
 
 4. **Add the secrets** under **Settings > Actions > Secrets**:
    - `UPLOAD_KEYSTORE_BASE64`: the output of `base64 -w0 ~/.config/musicshare/musicshare-upload.jks`.
-   - `UPLOAD_STORE_PASSWORD`, `UPLOAD_KEY_ALIAS` (`musicshare-upload`), `UPLOAD_KEY_PASSWORD`: the values in
+   - `MUSICSHARE_UPLOAD_STORE_PASSWORD`, `MUSICSHARE_UPLOAD_KEY_ALIAS` (`musicshare-upload`), `MUSICSHARE_UPLOAD_KEY_PASSWORD`: the values in
      `~/.gradle/gradle.properties` on the machine you've been building on.
    - `RELEASE_TOKEN`: create it under **User settings > Applications > Access tokens**, with
      *write:repository* and *write:package* permissions.