From 868468ecad1e4a9b06ed8d80b14a939475e00bc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Francisco=20Concepci=C3=B3n?= <costular@gmail.com>
Date: Tue, 21 Jul 2026 13:34:15 +0100
Subject: [PATCH] Create PR for release changelog

---
 .github/workflows/release.yml | 24 ++++++++++++++++--------
 AGENTS.md                     |  2 +-
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0a8bda44..97c47946 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -6,6 +6,7 @@ on:
 
 permissions:
   contents: write
+  pull-requests: write
 
 jobs:
   detekt:
@@ -144,14 +145,6 @@ jobs:
       - name: Prepare changelog
         run: python3 scripts/prepare-release-changelog.py --tag "${{ github.ref_name }}"
 
-      - name: Commit changelog
-        run: |
-          git config user.name "github-actions[bot]"
-          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
-          git add CHANGELOG.md
-          git diff --cached --quiet || git commit -m "Prepare changelog for ${{ github.ref_name }}"
-          git push origin main
-
       - name: Download bundle
         uses: actions/download-artifact@master
         with:
@@ -174,6 +167,21 @@ jobs:
             release-assets/app-production-release.aab
             release-assets/app-production-release.apk
 
+      - name: Create changelog pull request
+        uses: peter-evans/create-pull-request@v8
+        with:
+          add-paths: CHANGELOG.md
+          author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
+          branch: release/prepare-changelog-${{ github.ref_name }}
+          commit-message: Prepare changelog for ${{ github.ref_name }}
+          committer: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
+          delete-branch: true
+          title: Prepare changelog for ${{ github.ref_name }}
+          body: |
+            Promotes the Unreleased changelog entries for `${{ github.ref_name }}`.
+
+            This pull request was created by the release workflow after publishing the GitHub release.
+
   deploy-play-store:
     needs: [ build ]
     runs-on: ubuntu-latest
diff --git a/AGENTS.md b/AGENTS.md
index aff16941..31d3fb7f 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -32,7 +32,7 @@
 - PR descriptions should state intent, local testing, and UI impact (attach screenshots or screencasts).
 - Link issues, call out config or feature flag changes, and note any follow-up work.
 - Add release-note-worthy changes to `CHANGELOG.md` under `## [Unreleased]`, using the existing Keep a Changelog categories and markdown format.
-- Do not manually promote `Unreleased`, add release dates, or create the next empty `Unreleased` section; the release workflow handles that when a tag is created.
+- Do not manually promote `Unreleased`, add release dates, or create the next empty `Unreleased` section; the release workflow handles that when a tag is created, committing the promotion to a release pull request for `main`.
 
 ## Security & Configuration Tips
 - Signing uses `SIGNING_*` env vars; never commit keystores or secrets.