Skip to content

Commit

Permalink
[v16] ci: Enable auto-merge on post-release workflow PRs (#51331)
Browse files Browse the repository at this point in the history
Enable auto-merge on the PRs created by the post-release workflow.
Getting these PRs merged manually can often be forgotten that it is
standard to enable auto-merge on them. Let's do that automatically.
  • Loading branch information
camscale authored Jan 23, 2025
1 parent 7cbf273 commit 39affa3
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
4 changes: 3 additions & 1 deletion .github/workflows/post-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -122,4 +122,6 @@ jobs:
gh pr create --fill "--base=${BASE_BRANCH}" \
--label=automated --label=documentation --label=no-changelog \
"--reviewer=${REVIEWER}"
echo "Docs PR: $(gh pr view --json url --jq .url)" >> "$GITHUB_STEP_SUMMARY"
# enable auto-merge
gh pr merge --auto --squash
echo "Docs PR: $(gh pr view --json url --jq .url)" >> "$GITHUB_STEP_SUMMARY"
2 changes: 2 additions & 0 deletions assets/aws/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,5 @@ create-update-pr: update-ami-ids-terraform
git commit -am "[auto] Update AMI IDs for $(TELEPORT_VERSION)"
git push --set-upstream origin $(AUTO_BRANCH_NAME)
gh pr create --fill --label=automated --label=terraform --label=no-changelog $(if $(AMI_PR_REVIEWER),--reviewer=$(AMI_PR_REVIEWER))
# enable auto-merge
gh pr merge --auto --squash

0 comments on commit 39affa3

Please sign in to comment.