From d45f6a64586545d37b96fd6e5a2e582c84d4d5a2 Mon Sep 17 00:00:00 2001 From: RemiBonnet Date: Tue, 7 Jul 2026 11:07:20 +0200 Subject: [PATCH] fix(release): use merge commits for production promotion --- .github/workflows/promote-production.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/promote-production.yml b/.github/workflows/promote-production.yml index c15ad26b30b..61a071cf39d 100644 --- a/.github/workflows/promote-production.yml +++ b/.github/workflows/promote-production.yml @@ -68,7 +68,7 @@ jobs: run: | pr_body="$(printf '%s\n\n%s' \ 'Opens the production promotion path from staging to main. Merging this PR triggers semantic-release, then the existing production deployment workflow.' \ - 'Do not squash this PR. Use rebase merge to preserve the original conventional commits for semantic-release.')" + 'Do not squash this PR. Use a merge commit to preserve the original conventional commits for semantic-release.')" pr_url="$(gh pr create \ --repo "$REPOSITORY" \ @@ -143,7 +143,7 @@ jobs: gh pr merge "$pr_url" \ --repo "$REPOSITORY" \ --auto \ - --rebase + --merge echo "Auto-merge enabled for ${pr_url}"