Skip to content

Commit f2a7dc0

Browse files
committed
fix android ci
1 parent dad253d commit f2a7dc0

File tree

1 file changed

+19
-20
lines changed

1 file changed

+19
-20
lines changed

.github/workflows/android.yml

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,29 +11,27 @@ on:
1111
workflow_dispatch:
1212

1313
jobs:
14-
publish-android:
14+
build-android:
1515
runs-on: ubuntu-latest
16-
permissions:
17-
contents: write
1816
steps:
1917
- uses: actions/checkout@v4
20-
21-
- name: Setup Java
22-
uses: actions/setup-java@v4
2318
with:
24-
distribution: "zulu"
25-
java-version: "17"
26-
27-
- name: Setup Android SDK
28-
uses: android-actions/setup-android@v3
29-
30-
- name: Install NDK
31-
run: sdkmanager "ndk;28.0.12674087"
32-
33-
- name: Install Rust stable
34-
uses: dtolnay/rust-toolchain@stable
19+
submodules: true
20+
- uses: dtolnay/rust-toolchain@stable
3521
with:
3622
targets: aarch64-linux-android
23+
- uses: Swatinem/rust-cache@v2
24+
- uses: actions/setup-java@v2
25+
with:
26+
distribution: "temurin"
27+
java-version: "17"
28+
- uses: android-actions/setup-android@v3
29+
with:
30+
packages: "platforms;android-32"
31+
- uses: nttld/setup-ndk@v1
32+
id: setup-ndk
33+
with:
34+
ndk-version: r26b
3735

3836
- uses: taiki-e/cache-cargo-install-action@v2
3937
with:
@@ -44,9 +42,10 @@ jobs:
4442
keytool -genkey -v -keystore /tmp/debug.keystore -storepass android -alias androiddebugkey -keypass android -keyalg RSA -keysize 2048 -validity 10000 -dname "C=US, O=Android, CN=Android Debug"
4543
cargo apk build -p callme-egui --target aarch64-linux-android --lib --release
4644
env:
47-
ANDROID_NDK: ${{ env.ANDROID_HOME }}/ndk/28.0.12433566
48-
ANDROID_NDK_ROOT: ${{ env.ANDROID_HOME }}/ndk/28.0.12433566
49-
TOOLCHAIN: ${{ env.ANDROID_HOME }}/ndk/28.0.12433566/toolchains/llvm/prebuilt/linux-x86_64
45+
ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
46+
ANDROID_NDK_ROOT: ${{ steps.setup-ndk.outputs.ndk-path }}
47+
ANDROID_NDK: ${{ steps.setup-ndk.outputs.ndk-path }}
48+
TOOLCHAIN: ${{ steps.setup-ndk.outputs.ndk-path }}/toolchains/llvm/prebuilt/linux-x86_64
5049
CARGO_APK_RELEASE_KEYSTORE_PASSWORD: android
5150
CARGO_APK_RELEASE_KEYSTORE: /tmp/debug.keystore
5251

0 commit comments

Comments
 (0)