diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 723dbbf..fcc5d53 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -49,17 +49,29 @@ jobs: RELEASE_KEY_ALIAS: ${{ secrets.RELEASE_KEY_ALIAS }} RELEASE_KEY_PASSWORD: ${{ secrets.RELEASE_KEY_PASSWORD }} run: | + # 1. Setup Java if [ -z "$JAVA_HOME" ] || [ ! -d "$JAVA_HOME" ]; then JAVA_BIN=$(which java 2>/dev/null || find /usr /opt -name java -type f 2>/dev/null | grep -E '/bin/java$' | head -n 1 || echo /usr/lib/jvm/java-21-openjdk-amd64/bin/java) export JAVA_HOME=$(dirname $(dirname $(readlink -f "$JAVA_BIN"))) export PATH="$JAVA_HOME/bin:$PATH" fi - if [ -z "$ANDROID_HOME" ] || [ ! -d "$ANDROID_HOME" ]; then - export ANDROID_HOME=/opt/android-sdk-linux - export ANDROID_SDK_ROOT=/opt/android-sdk-linux - export PATH="$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-tools:$PATH" + + # 2. Setup Android SDK and local.properties + SDK_DIR="/opt/android-sdk-linux" + if [ ! -d "$SDK_DIR" ]; then + SDK_DIR=$(find /opt /usr /root -maxdepth 3 -name "platforms" -type d 2>/dev/null | head -n 1 | xargs -r dirname) fi - ./gradlew assembleRelease --no-daemon + echo "Using Android SDK at: $SDK_DIR" + export ANDROID_HOME="$SDK_DIR" + export ANDROID_SDK_ROOT="$SDK_DIR" + export PATH="$SDK_DIR/cmdline-tools/latest/bin:$SDK_DIR/platform-tools:$PATH" + + # Write local.properties so Gradle finds it unconditionally + echo "sdk.dir=$SDK_DIR" > local.properties + cat local.properties + + # 3. Build Release APK without lint + ./gradlew assembleRelease -Pandroid.sdk.path="$SDK_DIR" -x lint -x lintVitalRelease -x lintVitalReportRelease --no-daemon - name: Rename APK run: | diff --git a/app/build.gradle.kts b/app/build.gradle.kts index c1094ee..ca914bb 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -41,6 +41,11 @@ android { buildConfig = true } + lint { + checkReleaseBuilds = false + abortOnError = false + } + signingConfigs { create("release") { val storeFileProp = getProp("RELEASE_STORE_FILE") diff --git a/gradle.properties b/gradle.properties index 9fd2a18..5da2109 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ android.enableJetifier=false kotlin.code.style=official android.nonTransitiveRClass=true android.suppressUnsupportedCompileSdk=34 -android.builder.sdkDownload=true +android.builder.sdkDownload=false org.gradle.parallel=false org.gradle.configureondemand=false