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

fix(ci): drop ANDROID_SDK_ROOT, pass --sdk_root to sdkmanager explicitly
Android Build / build-apk (push) Failing after 3m19s
Details
Build and Deploy / build-and-push (push) Successful in 30s
Details

Browse Source 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
funman300
2026-05-14 10:47:51 -07:00
parent 76911c57c9
commit bb670d6cc6
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitea/workflows/android-build.yml
+5 -6
View File
@@ -12,7 +12,6 @@ on:
- '**.md' - '**.md'
env: env:
ANDROID_SDK_ROOT: /opt/android-sdk
ANDROID_HOME: /opt/android-sdk ANDROID_HOME: /opt/android-sdk
ANDROID_NDK_HOME: /opt/android-sdk/ndk/25.2.9519653 ANDROID_NDK_HOME: /opt/android-sdk/ndk/25.2.9519653
NDK_VERSION: "25.2.9519653" NDK_VERSION: "25.2.9519653"
@@ -36,7 +35,7 @@ jobs:
uses: actions/cache@v4 uses: actions/cache@v4
id: sdk-cache id: sdk-cache
with: with:
path: ${{ env.ANDROID_SDK_ROOT }} path: ${{ env.ANDROID_HOME }}
key: v2-android-sdk-ndk${{ env.NDK_VERSION }}-bt${{ env.BUILD_TOOLS_VERSION }} key: v2-android-sdk-ndk${{ env.NDK_VERSION }}-bt${{ env.BUILD_TOOLS_VERSION }}
- name: Install system dependencies - name: Install system dependencies
@@ -47,16 +46,16 @@ 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_SDK_ROOT/cmdline-tools" 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_SDK_ROOT/cmdline-tools/latest" mv /tmp/cmdtools/cmdline-tools "$ANDROID_HOME/cmdline-tools/latest"
# Accept all SDK licences non-interactively. # Accept all SDK licences non-interactively.
yes | "$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager" --licenses \ yes | "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" --sdk_root="$ANDROID_HOME" --licenses \
> /dev/null 2>&1 || true > /dev/null 2>&1 || true
"$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager" \ "$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"
.gitea/workflows/android-release.yml
+5 -6
View File
@@ -6,7 +6,6 @@ on:
- 'v*.*.*' - 'v*.*.*'
env: env:
ANDROID_SDK_ROOT: /opt/android-sdk
ANDROID_HOME: /opt/android-sdk ANDROID_HOME: /opt/android-sdk
ANDROID_NDK_HOME: /opt/android-sdk/ndk/25.2.9519653 ANDROID_NDK_HOME: /opt/android-sdk/ndk/25.2.9519653
NDK_VERSION: "25.2.9519653" NDK_VERSION: "25.2.9519653"
@@ -33,7 +32,7 @@ jobs:
uses: actions/cache@v4 uses: actions/cache@v4
id: sdk-cache id: sdk-cache
with: with:
path: ${{ env.ANDROID_SDK_ROOT }} path: ${{ env.ANDROID_HOME }}
key: v2-android-sdk-ndk${{ env.NDK_VERSION }}-bt${{ env.BUILD_TOOLS_VERSION }} key: v2-android-sdk-ndk${{ env.NDK_VERSION }}-bt${{ env.BUILD_TOOLS_VERSION }}
# Java and jq are always needed (apksigner requires Java even on cache hits). # Java and jq are always needed (apksigner requires Java even on cache hits).
@@ -45,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_SDK_ROOT/cmdline-tools" 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_SDK_ROOT/cmdline-tools/latest" mv /tmp/cmdtools/cmdline-tools "$ANDROID_HOME/cmdline-tools/latest"
yes | "$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager" --licenses \ yes | "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" --sdk_root="$ANDROID_HOME" --licenses \
> /dev/null 2>&1 || true > /dev/null 2>&1 || true
"$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager" \ "$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"