diff --git a/.github/workflows/tauri-build.yml b/.github/workflows/tauri-build.yml index 6dae65e73..1158c3db1 100644 --- a/.github/workflows/tauri-build.yml +++ b/.github/workflows/tauri-build.yml @@ -366,13 +366,16 @@ jobs: uses: dtolnay/rust-toolchain@2c7215f132e9ebf062739d9130488b56d53c060c # 2c7215f132e9ebf062739d9130488b56d53c060c with: toolchain: stable - targets: aarch64-linux-android,armv7-linux-androideabi,i686-linux-android,x86_64-linux-android + targets: aarch64-linux-android,armv7-linux-androideabi - name: Cache Rust build uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4 # v2.9.1 with: workspaces: src-tauri + - name: Cache Gradle + uses: gradle/actions/setup-gradle@748248ddd2a24f49513d8f472f81c3a07d4d50e1 # v4.4.4 + - name: Resolve NDK shell: bash run: | @@ -401,7 +404,7 @@ jobs: if [ "$IS_NIGHTLY" = "true" ]; then ARGS+=(--config src-tauri/tauri.nightly.conf.json) fi - pnpm tauri android build --apk --aab "${ARGS[@]}" + pnpm tauri android build --apk --aab --target aarch64 armv7 "${ARGS[@]}" OUT='src-tauri/gen/android/app/build/outputs' APK=$(find "$OUT/apk/universal/release" -name '*.apk' -type f | head -1) AAB=$(find "$OUT/bundle/universalRelease" -name '*.aab' -type f | head -1) diff --git a/src-tauri/gen/android/gradle.properties b/src-tauri/gen/android/gradle.properties index 2a7ec6959..6ef904e75 100644 --- a/src-tauri/gen/android/gradle.properties +++ b/src-tauri/gen/android/gradle.properties @@ -6,11 +6,13 @@ # http://www.gradle.org/docs/current/userguide/build_environment.html # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 +org.gradle.jvmargs=-Xmx4096m -Dfile.encoding=UTF-8 # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true +org.gradle.parallel=true +# Reuse task outputs from the build cache (persisted across CI runs by gradle/actions/setup-gradle). +org.gradle.caching=true # AndroidX package structure to make it clearer which packages are bundled with the # Android operating system, and which are packaged with your app"s APK # https://developer.android.com/topic/libraries/support-library/androidx-rn