From a854c839e4f229c8dc050f155e82afbde210de6b Mon Sep 17 00:00:00 2001
From: James Rich <2199651+jamesarich@users.noreply.github.com>
Date: Thu, 5 Mar 2026 14:51:47 -0600
Subject: [PATCH] ci: Refine APK artifact paths and enable automatic release
 notes generation (#4727)

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

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 18f230a2d..18aa1d68e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -171,7 +171,7 @@ jobs:
         uses: actions/upload-artifact@v7
         with:
           name: google-apk
-          path: app/build/outputs/apk/**/*.apk
+          path: app/build/outputs/apk/google/release/*.apk
           retention-days: 1
 
       - name: Attest Google AAB provenance
@@ -184,7 +184,7 @@ jobs:
         if: always()
         uses: actions/attest-build-provenance@v4
         with:
-          subject-path: app/build/outputs/apk/**/*.apk
+          subject-path: app/build/outputs/apk/google/release/*.apk
 
   release-fdroid:
     runs-on: ubuntu-latest
@@ -243,14 +243,14 @@ jobs:
         uses: actions/upload-artifact@v7
         with:
           name: fdroid-apk
-          path: app/build/outputs/apk/**/*.apk
+          path: app/build/outputs/apk/fdroid/release/*.apk
           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
+          subject-path: app/build/outputs/apk/fdroid/release/*.apk
 
   github-release:
     runs-on: ubuntu-latest
@@ -278,7 +278,7 @@ jobs:
           tag_name: ${{ inputs.tag_name }}
           target_commitish: ${{ inputs.commit_sha || github.sha }}
           name: ${{ inputs.tag_name }} (${{ needs.prepare-build-info.outputs.APP_VERSION_CODE }})
-          generate_release_notes: false
+          generate_release_notes: true
           files: ./artifacts/*/*
           draft: true
           prerelease: true