From 3b531b61a3563dcfd0a009708b69e09646570bd4 Mon Sep 17 00:00:00 2001
From: James Rich <2199651+jamesarich@users.noreply.github.com>
Date: Fri, 27 Feb 2026 09:48:10 -0600
Subject: [PATCH] ci: Split Google artifact attestations and ensure F-Droid
 uploads (#4665)

---
 .github/workflows/release.yml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 2db494892..b745d0850 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -195,13 +195,17 @@ jobs:
           path: app/build/outputs/apk/**/*.apk
           retention-days: 1
 
-      - name: Attest Google artifacts provenance
+      - name: Attest Google AAB provenance
         if: always()
         uses: actions/attest-build-provenance@v4
         with:
-          subject-path: |
-            app/build/outputs/bundle/googleRelease/app-google-release.aab
-            app/build/outputs/apk/**/*.apk
+          subject-path: app/build/outputs/bundle/googleRelease/app-google-release.aab
+
+      - name: Attest Google APK provenance
+        if: always()
+        uses: actions/attest-build-provenance@v4
+        with:
+          subject-path: app/build/outputs/apk/**/*.apk
 
   release-fdroid:
     runs-on: ubuntu-latest
@@ -257,6 +261,7 @@ jobs:
         run: ls -R app/build/outputs/
 
       - name: Upload F-Droid APK artifact
+        if: always()
         uses: actions/upload-artifact@v7
         with:
           name: fdroid-apk
@@ -264,6 +269,7 @@ jobs:
           retention-days: 1
 
       - name: Attest F-Droid APK provenance
+        if: always()
         uses: actions/attest-build-provenance@v4
         with:
           subject-path: app/build/outputs/apk/**/*.apk