From e4f006fc7d3c8fb62802760a24cc5edee6331981 Mon Sep 17 00:00:00 2001
From: Aaron Bull Schaefer <aaron@elasticdog.com>
Date: Fri, 23 Jan 2026 14:24:25 -0800
Subject: [PATCH 1/2] Use consistent wording for release preparation pull
 requests

---
 .github/workflows/bump-version-flutter-app.yml | 2 +-
 .github/workflows/bump-version-flutter-lib.yml | 2 +-
 .github/workflows/bump-version-rust.yml        | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/bump-version-flutter-app.yml b/.github/workflows/bump-version-flutter-app.yml
index 555a13c..5e5e29a 100644
--- a/.github/workflows/bump-version-flutter-app.yml
+++ b/.github/workflows/bump-version-flutter-app.yml
@@ -95,7 +95,7 @@ jobs:
           branch: release/bump-version
           branch-suffix: timestamp
           commit-message: Release v${{ steps.version.outputs.release_version }}
-          title: Prepare v${{ steps.version.outputs.release_version }} release.
+          title: Prepare the v${{ steps.version.outputs.release_version }} release
           body: |-
             This PR was automatically created by the [bump-version](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}) workflow, which ran the following commands:
 
diff --git a/.github/workflows/bump-version-flutter-lib.yml b/.github/workflows/bump-version-flutter-lib.yml
index 570c7c4..93ffc48 100644
--- a/.github/workflows/bump-version-flutter-lib.yml
+++ b/.github/workflows/bump-version-flutter-lib.yml
@@ -94,7 +94,7 @@ jobs:
           branch: release/bump-version
           branch-suffix: timestamp
           commit-message: Release v${{ steps.version.outputs.release_version }}
-          title: Prepare v${{ steps.version.outputs.release_version }} ${{ inputs.level }} release.
+          title: Prepare the v${{ steps.version.outputs.release_version }} ${{ inputs.level }} release
           body: |-
             This PR was automatically created by the [bump-version](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}) workflow, which ran the following commands:
 
diff --git a/.github/workflows/bump-version-rust.yml b/.github/workflows/bump-version-rust.yml
index 154488f..1c80745 100644
--- a/.github/workflows/bump-version-rust.yml
+++ b/.github/workflows/bump-version-rust.yml
@@ -83,8 +83,8 @@ jobs:
         with:
           token: ${{ steps.generate_token.outputs.token }}
           branch-suffix: timestamp
-          commit-message: Prepare ${{ inputs.package }} v${{ env.release_version }} ${{ inputs.level }} release
-          title: Prepare ${{ inputs.package }} v${{ env.release_version }} ${{ inputs.level }} release
+          commit-message: Release ${{ inputs.package }} v${{ env.release_version }}
+          title: Prepare the ${{ inputs.package }} v${{ env.release_version }} ${{ inputs.level }} release
           body: |-
             This PR was automatically created by the [bump-version](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}) workflow, which ran the following commands:
 

From 468e868799364f28cc576e96d7c4fdc72aca3b39 Mon Sep 17 00:00:00 2001
From: Aaron Bull Schaefer <aaron@elasticdog.com>
Date: Fri, 23 Jan 2026 14:25:37 -0800
Subject: [PATCH 2/2] Use Prettier to fix any CHANGELOG formatting before
 releases

---
 .github/workflows/bump-version-flutter-app.yml | 3 +++
 .github/workflows/bump-version-flutter-lib.yml | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/.github/workflows/bump-version-flutter-app.yml b/.github/workflows/bump-version-flutter-app.yml
index 5e5e29a..78e09d6 100644
--- a/.github/workflows/bump-version-flutter-app.yml
+++ b/.github/workflows/bump-version-flutter-app.yml
@@ -74,6 +74,9 @@ jobs:
       - name: Bump CHANGELOG version to match
         run: get-project-version | bump-changelog-version
 
+      - name: Fix up CHANGELOG formatting
+        run: npx --yes prettier@latest --color --prose-wrap always --write -- **/CHANGELOG.md
+
       - id: version
         name: Get the new release version
         run: |
diff --git a/.github/workflows/bump-version-flutter-lib.yml b/.github/workflows/bump-version-flutter-lib.yml
index 93ffc48..8dece35 100644
--- a/.github/workflows/bump-version-flutter-lib.yml
+++ b/.github/workflows/bump-version-flutter-lib.yml
@@ -73,6 +73,9 @@ jobs:
       - name: Bump CHANGELOG version to match
         run: get-project-version | bump-changelog-version
 
+      - name: Fix up CHANGELOG formatting
+        run: npx --yes prettier@latest --color --prose-wrap always --write -- **/CHANGELOG.md
+
       - id: version
         name: Get the new release version
         run: |