@@ -72,10 +72,12 @@ jobs:
7272 # ADFA-4533: GlitchTip DSN for release builds
7373 SENTRY_DSN_RELEASE : ${{ secrets.SENTRY_DSN_RELEASE }}
7474 run : |
75- # Release tags ship a clean version (v0.7.0-beta ), no commit hash. build.gradle only
75+ # Release tags ship a clean version (v1.0.0 ), no commit hash. build.gradle only
7676 # falls back to the git SHA suffix when versionSuffix is absent; pass it empty here.
7777 # In-APK traceability is unaffected: BuildConfig.GIT_SHA still records the commit.
78- ./gradlew assembleStandardRelease \
78+ # K2GO-431: build both flavors. standard -> GitHub + R2 + OTA update.json (as before);
79+ # fdroid -> R2 only (F-Droid distributes it; it carries no in-app OTA).
80+ ./gradlew assembleStandardRelease assembleFdroidRelease \
7981 -PversionSuffix="" \
8082 -Pandroid.injected.signing.store.file=$(pwd)/keystore.jks \
8183 -Pandroid.injected.signing.store.password=$KEYSTORE_PASSWORD \
8688 uses : actions/upload-artifact@v6
8789 with :
8890 name : k2go-apks-release
89- path : controller/**/build/outputs/apk/standard /release/*.apk
91+ path : controller/**/build/outputs/apk/* /release/*.apk
9092 retention-days : 7
9193
9294 # --- GITHUB RELEASES ---
@@ -113,8 +115,10 @@ jobs:
113115 R2_ACCOUNT_ID : ${{ vars.CLOUDFLARE_ACCOUNT_ID }}
114116 BUCKET_NAME : " k2go-apk-repo"
115117 run : |
116- # Loop through all generated APKs (universal, arm64, armeabi) and upload them
117- for apk in $(find . -path "*/build/outputs/apk/release/*.apk"); do
118+ # K2GO-431: upload BOTH flavors (standard + fdroid) to R2. The flavor dir sits between
119+ # apk/ and release/ (apk/standard/release, apk/fdroid/release); the old apk/release path
120+ # never matched a flavored build.
121+ for apk in $(find . -path "*/build/outputs/apk/*/release/*.apk"); do
118122 filename=$(basename "$apk")
119123 echo "Uploading $filename to Cloudflare R2 ($BUCKET_NAME)..."
120124
@@ -159,7 +163,8 @@ jobs:
159163 echo "Changelog:"; printf '%s\n' "$CHANGELOG"
160164
161165 # Built APK basenames per ABI (the binaries just uploaded to R2).
162- find_apk() { find controller -path "*/build/outputs/apk/release/*$1*.apk" -printf '%f\n' | head -1; }
166+ # OTA update.json covers the standard flavor only (fdroid ships with OTA disabled).
167+ find_apk() { find controller -path "*/build/outputs/apk/standard/release/*$1*.apk" -printf '%f\n' | head -1; }
163168 # The APK filenames abbreviate the split's ABI (arm64-v8a -> v8a); see build.gradle.
164169 APK_ARM64=$(find_apk "-v8a-")
165170 APK_ARM32=$(find_apk "-v7a-")
0 commit comments