Skip to content

release.sh: use merge-commit for release PRs to preserve release notes #687

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bjorkert wants to merge 1 commit into
base: dev
Choose a base branch
from
+2 −2
Open

release.sh: use merge-commit for release PRs to preserve release notes #687

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ if [[ $confirm =~ ^[Yy]$ ]]; then

\`auto_version_dev\` detects that \`Config.xcconfig\` was changed in this push and skips re-bumping.

⚠️ **Use rebase-merge** (not squash or merge-commit) so \`dev\` and \`main\` end up at the same commit SHA after the release."
⚠️ **Use \"Create a merge commit\"** (not squash or rebase) so \`dev\` and \`main\` share the same release lineage."

echo; echo "📝 Opening release PR ${RELEASE_BRANCH} → ${MAIN_BRANCH} …"
gh pr create \
Expand All @@ -157,7 +157,7 @@ if [[ $confirm =~ ^[Yy]$ ]]; then

Merging this PR triggers the tagging workflow, which creates tag \`v${new_ver}\` from \`LOOP_FOLLOW_MARKETING_VERSION\` in \`Config.xcconfig\`.

⚠️ **Use rebase-merge** (not squash or merge-commit) so \`dev\` and \`main\` end up at the same commit SHA after the release."
⚠️ **Use \"Create a merge commit\"** (not squash or rebase) so \`main\` keeps the original feature-PR commits. Rebase rewrites them to new SHAs, which breaks GitHub's auto-generated release notes (no PR list, only the release author is credited) and diverges \`main\` from \`dev\`."

echo; echo "🎉 All repos updated to v${new_ver} (local). Release PRs opened (sync → dev, release → main)."
echo "👉 Review and merge both PRs — the tag will be created automatically by .github/workflows/tag_on_main.yml."
Expand Down
Loading