From 43ab228d7927bd956a91cea21dd41c996e8bdad3 Mon Sep 17 00:00:00 2001
From: researchxxl <244199422+researchxxl@users.noreply.github.com>
Date: Mon, 29 Dec 2025 17:40:26 +0100
Subject: [PATCH 1/4] build(nel0x): add bundleRelease

---
 .github/workflows/common-build.yaml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/.github/workflows/common-build.yaml b/.github/workflows/common-build.yaml
index 8ff52aec..c731a106 100644
--- a/.github/workflows/common-build.yaml
+++ b/.github/workflows/common-build.yaml
@@ -185,6 +185,13 @@ jobs:
           git config --global --add safe.directory '*'
           ./gradlew --no-daemon buildNative lint${{ inputs.buildType }} assemble${{ inputs.buildType }}
 
+      - name: Build bundle
+        if: ${{ inputs.buildType == 'Release' }}
+        run: |
+          set -eu
+          unset ANDROID_NDK_HOME
+          ./gradlew --no-daemon bundle${{ inputs.buildType }}
+
       - name: Save prebuilt native libraries to cache
         run: |
           set -eu
@@ -254,6 +261,14 @@ jobs:
           path: |
             app/build/outputs/apk/*/*.apk
 
+      - name: Upload unsigned bundle artifact
+        if: ${{ inputs.buildType == 'Release' }}
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
+        with:
+          name: unsigned-bundle-${{ env.APPLICATION_ID }}
+          path: |
+            app/build/outputs/bundle/release/app-release-unsigned.aab
+
       - name: Check modified files
         if: ${{ github.event_name == 'pull_request' }}
         run: |

From 1c4563e70a1e20a1da765fd6a0b0cb689871be98 Mon Sep 17 00:00:00 2001
From: researchxxl <244199422+researchxxl@users.noreply.github.com>
Date: Mon, 29 Dec 2025 17:46:32 +0100
Subject: [PATCH 2/4] disable branch check for testing

---
 .github/workflows/release-app.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/release-app.yaml b/.github/workflows/release-app.yaml
index e5d266ce..9eb17acd 100644
--- a/.github/workflows/release-app.yaml
+++ b/.github/workflows/release-app.yaml
@@ -27,6 +27,7 @@ jobs:
           ref: ${{ inputs.checkoutRef }}
 
       - name: Ensure release branch
+        if: false
         run: |
           git config --global --add safe.directory '*'
           if ! git branch -a --contains $(git rev-parse HEAD) | grep release >/dev/null; then

From 130a3f83b23e47a63350aba92d0bfcdc9b53fea1 Mon Sep 17 00:00:00 2001
From: researchxxl <244199422+researchxxl@users.noreply.github.com>
Date: Mon, 29 Dec 2025 17:56:33 +0100
Subject: [PATCH 3/4] adapt via inputs.gradleOptions

---
 .github/workflows/common-build.yaml | 15 ++++++---------
 .github/workflows/release-app.yaml  |  1 +
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/common-build.yaml b/.github/workflows/common-build.yaml
index c731a106..f65b95d5 100644
--- a/.github/workflows/common-build.yaml
+++ b/.github/workflows/common-build.yaml
@@ -18,6 +18,10 @@ on:
         description: 'Git ref'
         required: false
         type: string
+      gradleOptions:
+        description: 'Gradle options'
+        required: false
+        type: string
 
 jobs:
   build:
@@ -183,14 +187,7 @@ jobs:
           set -eu
           unset ANDROID_NDK_HOME
           git config --global --add safe.directory '*'
-          ./gradlew --no-daemon buildNative lint${{ inputs.buildType }} assemble${{ inputs.buildType }}
-
-      - name: Build bundle
-        if: ${{ inputs.buildType == 'Release' }}
-        run: |
-          set -eu
-          unset ANDROID_NDK_HOME
-          ./gradlew --no-daemon bundle${{ inputs.buildType }}
+          ./gradlew --no-daemon buildNative lint${{ inputs.buildType }} assemble${{ inputs.buildType }} ${{ inputs.gradleOptions }}
 
       - name: Save prebuilt native libraries to cache
         run: |
@@ -262,7 +259,7 @@ jobs:
             app/build/outputs/apk/*/*.apk
 
       - name: Upload unsigned bundle artifact
-        if: ${{ inputs.buildType == 'Release' }}
+        if: ${{ inputs.gradleOptions == 'bundleRelease' }}
         uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: unsigned-bundle-${{ env.APPLICATION_ID }}
diff --git a/.github/workflows/release-app.yaml b/.github/workflows/release-app.yaml
index 016ed138..140c26c9 100644
--- a/.github/workflows/release-app.yaml
+++ b/.github/workflows/release-app.yaml
@@ -52,6 +52,7 @@ jobs:
       applicationId: "com.github.catfriend1.syncthingandroid"
       buildType: "Release"
       checkoutRef: ${{ github.event.inputs.tag }}
+      gradleOptions: "bundleRelease"
 
   sign1:
     name: Sign 1

From 9fea32a51643fcb73a4c3f3116ab6d52158b2b3a Mon Sep 17 00:00:00 2001
From: researchxxl <244199422+researchxxl@users.noreply.github.com>
Date: Mon, 29 Dec 2025 18:14:46 +0100
Subject: [PATCH 4/4] correct unsigned aab path

---
 .github/workflows/common-build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/common-build.yaml b/.github/workflows/common-build.yaml
index f65b95d5..04db3d5e 100644
--- a/.github/workflows/common-build.yaml
+++ b/.github/workflows/common-build.yaml
@@ -264,7 +264,7 @@ jobs:
         with:
           name: unsigned-bundle-${{ env.APPLICATION_ID }}
           path: |
-            app/build/outputs/bundle/release/app-release-unsigned.aab
+            app/build/outputs/bundle/release/app-release.aab
 
       - name: Check modified files
         if: ${{ github.event_name == 'pull_request' }}