diff --git a/.gitea/workflows/android-build.yml b/.gitea/workflows/android-build.yml index a33abce..a76d7eb 100644 --- a/.gitea/workflows/android-build.yml +++ b/.gitea/workflows/android-build.yml @@ -2,9 +2,9 @@ name: Android Build on: push: - branches: [ master, main ] + branches: [ main, master ] pull_request: - branches: [ master, main ] + branches: [ main, master ] workflow_dispatch: jobs: @@ -19,44 +19,20 @@ jobs: run: | export JAVA_HOME=/usr/lib/jvm/java-17-openjdk export PATH=$JAVA_HOME/bin:$PATH - echo "JAVA_HOME=$JAVA_HOME" >> $GITHUB_ENV - echo "=== 使用 Java 17 ===" java -version - name: Build Debug APK run: | - # 验证环境 - echo "=== 环境检查 ===" - java -version - gradle --version - - # 设置 Android SDK 环境变量 export ANDROID_HOME=/opt/android-sdk - export ANDROID_SDK_ROOT=$ANDROID_HOME - export PATH=$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-tools:$ANDROID_HOME/build-tools/34.0.0:$PATH - - # 使用 ARM64 版本的 aapt2(来自 lzhiyong/android-sdk-tools) + export PATH=$ANDROID_HOME/cmdline-tools/latest/bin:$PATH export CUSTOM_AAPT2_PATH=/usr/bin/aapt2 - echo "=== 使用 ARM64 aapt2 (35.0.2) ===" - # 创建 gradle.properties 配置 - echo "org.gradle.jvmargs=-Xmx2g -XX:+UseG1GC -XX:MaxMetaspaceSize=512m" >> gradle.properties + echo "org.gradle.jvmargs=-Xmx2g" >> gradle.properties echo "org.gradle.daemon=false" >> gradle.properties - # 使用自定义 aapt2 路径 echo "android.aapt2FromMavenOverride=$CUSTOM_AAPT2_PATH" >> gradle.properties - # 直接使用系统 Gradle 8.14.4 编译(使用 ARM64 aapt2) - echo "=== 开始编译 ===" - gradle assembleDebug \ - --no-daemon \ - --stacktrace \ - --no-watch-fs \ - --no-configuration-cache \ - --no-build-cache \ - -Dfile.encoding=UTF-8 + gradle assembleDebug --no-daemon --stacktrace - # 验证输出 - echo "=== 编译完成 ===" ls -lh app/build/outputs/apk/debug/ - name: Upload APK