funman300/Ferrous-Solitaire
1
1
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 28 Wiki Activity

fix(ci): replace ANDROID_SDK_ROOT with ANDROID_HOME in release workflow
Android Build / build-apk (push) Failing after 3m49s
Details
Build and Deploy / build-and-push (push) Successful in 54s
Details

Browse Source 
ANDROID_SDK_ROOT was never set; zipalign and apksigner were resolving
to empty paths and would fail. All three occurrences replaced with
ANDROID_HOME which is defined in the workflow env block.

Also adds sudo to the cache-miss SDK install (mkdir/mv/sdkmanager) to
match the debug workflow pattern — /opt/android-sdk requires root on
a fresh runner.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
funman300
2026-05-14 10:56:42 -07:00
parent 01d6b27e61
commit 4db43fb3fb
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitea/workflows/android-release.yml
+7 -7
View File
@@ -44,15 +44,15 @@ jobs:
- name: Install Android SDK + NDK - name: Install Android SDK + NDK
if: steps.sdk-cache.outputs.cache-hit != 'true' if: steps.sdk-cache.outputs.cache-hit != 'true'
run: | run: |
mkdir -p "$ANDROID_HOME/cmdline-tools" sudo mkdir -p "$ANDROID_HOME/cmdline-tools"
curl -sL \ curl -sL \
"https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip" \ "https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip" \
-o /tmp/cmdtools.zip -o /tmp/cmdtools.zip
unzip -q /tmp/cmdtools.zip -d /tmp/cmdtools unzip -q /tmp/cmdtools.zip -d /tmp/cmdtools
mv /tmp/cmdtools/cmdline-tools "$ANDROID_HOME/cmdline-tools/latest" sudo mv /tmp/cmdtools/cmdline-tools "$ANDROID_HOME/cmdline-tools/latest"
yes | "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" --sdk_root="$ANDROID_HOME" --licenses \ yes | sudo "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" --sdk_root="$ANDROID_HOME" --licenses \
> /dev/null 2>&1 || true > /dev/null 2>&1 || true
"$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" --sdk_root="$ANDROID_HOME" \ sudo "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" --sdk_root="$ANDROID_HOME" \
"build-tools;$BUILD_TOOLS_VERSION" \ "build-tools;$BUILD_TOOLS_VERSION" \
"platforms;android-34" \ "platforms;android-34" \
"ndk;$NDK_VERSION" "ndk;$NDK_VERSION"
@@ -115,10 +115,10 @@ jobs:
ALIGNED="/tmp/solitaire-quest-aligned.apk" ALIGNED="/tmp/solitaire-quest-aligned.apk"
SIGNED="ferrous-solitaire-${TAG}.apk" SIGNED="ferrous-solitaire-${TAG}.apk"
"$ANDROID_SDK_ROOT/build-tools/$BUILD_TOOLS_VERSION/zipalign" -v 4 \ "$ANDROID_HOME/build-tools/$BUILD_TOOLS_VERSION/zipalign" -v 4 \
"$UNSIGNED" "$ALIGNED" "$UNSIGNED" "$ALIGNED"
"$ANDROID_SDK_ROOT/build-tools/$BUILD_TOOLS_VERSION/apksigner" sign \ "$ANDROID_HOME/build-tools/$BUILD_TOOLS_VERSION/apksigner" sign \
--ks /tmp/solitaire-release.jks \ --ks /tmp/solitaire-release.jks \
--ks-pass "pass:${{ secrets.KEYSTORE_PASS }}" \ --ks-pass "pass:${{ secrets.KEYSTORE_PASS }}" \
--ks-key-alias "${{ secrets.KEY_ALIAS }}" \ --ks-key-alias "${{ secrets.KEY_ALIAS }}" \
@@ -129,7 +129,7 @@ jobs:
- name: Verify APK signature - name: Verify APK signature
run: | run: |
TAG="${{ steps.meta.outputs.tag }}" TAG="${{ steps.meta.outputs.tag }}"
"$ANDROID_SDK_ROOT/build-tools/$BUILD_TOOLS_VERSION/apksigner" verify \ "$ANDROID_HOME/build-tools/$BUILD_TOOLS_VERSION/apksigner" verify \
--verbose "ferrous-solitaire-${TAG}.apk" --verbose "ferrous-solitaire-${TAG}.apk"
# ── Publish ──────────────────────────────────────────────────────── # ── Publish ────────────────────────────────────────────────────────