chore(release): squash post-release bump into one commit

fabisev · Aug 24, 2026 · Aug 25, 2026 · Aug 25, 2026 · Aug 26, 2026 · Aug 27, 2026
commit 649ce7ed5f5f5f44159033c8977f5d5e537012b9
diff --git a/.github/workflows/release-runtime-interface-client.yml b/.github/workflows/release-runtime-interface-client.yml
@@ -323,19 +323,15 @@ jobs:
           git commit -am "chore(ric): release ${EFFECTIVE_RELEASE_VERSION}"
           git tag "$TAG_NAME"
 
-          # Next development version commit. Also refresh the informational
-          # lastPublished marker to the version just published (rides in the
-          # post-release commit, so the tagged release commit is untouched).
+          # Single post-release commit: next development version bump, the
+          # lastPublished marker, and the changelog entry. Sits on top of the
+          # tag, so the tagged release commit is untouched. The changelog entry
+          # is passed via env, never interpolated into the script, so it can't
+          # inject shell.
           mvn versions:set -DnewVersion="$NEXT_DEV_VERSION" -DgenerateBackupPoms=false --file "$MODULE/pom.xml"
           if grep -q "<!-- lastPublished:" "$MODULE/pom.xml"; then
             sed -i "s|<!-- lastPublished:.*-->|<!-- lastPublished: ${EFFECTIVE_RELEASE_VERSION} (auto-updated by release-runtime-interface-client.yml) -->|" "$MODULE/pom.xml"
           fi
-          git commit -am "chore(ric): prepare next development ${NEXT_DEV_VERSION}"
-
-          # Prepend the changelog entry so it ships in the version-bump PR (on
-          # top of the dev-version commit, after the tag, so the tag itself is
-          # unchanged). Passed via env, never interpolated into the script, so
-          # it can't inject shell.
           CHANGELOG="$MODULE/RELEASE.CHANGELOG.md"
           TMP="$(mktemp)"
           {
@@ -346,7 +342,7 @@ jobs:
           } > "$TMP"
           mv "$TMP" "$CHANGELOG"
           git add "$CHANGELOG"
-          git commit -m "docs(release): add ${MODULE} ${EFFECTIVE_RELEASE_VERSION} changelog entry"
+          git commit -am "chore(release): prepare next development, record ${MODULE} ${EFFECTIVE_RELEASE_VERSION} lastPublished and changelog"
 
           # Tag push isn't gated by branch protection; the version-bump commits
           # go to a release branch and land on main via PR.

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -247,32 +247,24 @@ jobs:
             -Darguments="-gs $MAVEN_SETTINGS -Prelease -Dgpg.keyname=$GPG_KEYNAME" \
             --file "$MODULE/pom.xml"
 
-      # Record the published version in the module's lastPublished comment so
-      # the POM reflects what's on Central. Rides in the version-bump PR below
-      # (main is protected).
-      - name: Record released version (POM lastPublished)
+      # Fold the lastPublished marker and changelog entry into the single
+      # next-development commit that release:prepare created (local, unpushed),
+      # so the whole post-release bump is ONE commit in the version-bump PR
+      # below (main is protected). The tag points at the prior release commit,
+      # so amending here leaves the tag untouched. The changelog entry is passed
+      # via env, never interpolated into the script, so it can't inject shell.
+      - name: Record next dev, lastPublished and changelog
         if: ${{ github.event.inputs.skip_publish != 'true' }}
         run: |
-          # Module's lastPublished annotation.
+          # Refresh the module's lastPublished marker to what was just published.
           if grep -q "<!-- lastPublished:" "$MODULE/pom.xml"; then
             sed -i "s|<!-- lastPublished:.*-->|<!-- lastPublished: ${EFFECTIVE_RELEASE_VERSION} (auto-updated by release.yml) -->|" "$MODULE/pom.xml"
             git add "$MODULE/pom.xml"
           else
             echo "::notice::$MODULE has no lastPublished comment; skipping annotation"
           fi
 
-          # Commit the record, or nothing if it didn't change.
-          if git diff --cached --quiet; then
-            echo "::notice::$MODULE already recorded at ${EFFECTIVE_RELEASE_VERSION}; nothing to commit"
-          else
-            git commit -m "chore(release): record ${MODULE} ${EFFECTIVE_RELEASE_VERSION} lastPublished"
-          fi
-
-      # Prepend the changelog entry so it ships in the version-bump PR. Passed
-      # via env, never interpolated into the script, so it can't inject shell.
-      - name: Prepend changelog entry
-        if: ${{ github.event.inputs.skip_publish != 'true' }}
-        run: |
+          # Prepend the changelog entry.
           CHANGELOG="$MODULE/RELEASE.CHANGELOG.md"
           TMP="$(mktemp)"
           {
@@ -283,7 +275,9 @@ jobs:
           } > "$TMP"
           mv "$TMP" "$CHANGELOG"
           git add "$CHANGELOG"
-          git commit -m "docs(release): add ${MODULE} ${EFFECTIVE_RELEASE_VERSION} changelog entry"
+
+          # Fold into release:prepare's next-dev commit -> one post-release commit.
+          git commit --amend -m "chore(release): prepare next development, record ${MODULE} ${EFFECTIVE_RELEASE_VERSION} lastPublished and changelog"
 
       # main is protected (no direct push), so push the tag and open a PR for
       # the version-bump commits instead. Skipping this would leave the POM on