ci: revert to squash-merge - #93
Merged
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
PR #91 merging via a real merge commit produced two identical changelog entries in the pending release PR (#84): GitHub embeds the PR title verbatim in the merge commit body, and since PR titles here often already read as conventional commits, release-please parsed both the merge commit and the original branch commit as separate changes (googleapis/release-please#2476).
#90 moved off squash-merge specifically to avoid jj dangling-commit buildup after merges. Tested that directly in a throwaway git+jj repo: simulated a real GitHub squash-merge (new commit on main, source branch deleted) and ran
jj git fetch. The orphaned commit and its bookmark were both cleaned up automatically —git.abandon-unreachable-commits(on by default) plus this repo'sdelete_branch_on_merge: truealready handle it. The premise for avoiding squash doesn't hold with the current jj version and repo settings.This reverts #90's CI/docs changes (restoring the
pr-titlecheck and squash-based wording in CONTRIBUTING.md, AGENTS.md, and the PR template) and switches the repo's merge button settings back to squash-only, with the squash commit message set to just the PR title. No merge commit is ever created going forward, so there's nothing for release-please to double-parse.Test plan
mise run lintpassesallow_squash_merge=true,allow_merge_commit=false,squash_merge_commit_title=PR_TITLE,squash_merge_commit_message=BLANKmainis a single commit whose message is exactly this PR's title