From 8b4b254efb55f6e9ef15119731018a1204100ba7 Mon Sep 17 00:00:00 2001 From: Cam Hutchison Date: Thu, 23 Jan 2025 15:56:49 +1100 Subject: [PATCH] [v17] ci: Enable auto-merge on post-release workflow PRs (#51330) 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. --- .github/workflows/post-release.yaml | 4 +++- assets/aws/Makefile | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/post-release.yaml b/.github/workflows/post-release.yaml index df1c33bb64798..89c72cabbf13e 100644 --- a/.github/workflows/post-release.yaml +++ b/.github/workflows/post-release.yaml @@ -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" diff --git a/assets/aws/Makefile b/assets/aws/Makefile index e65933213f99b..54b3cf783a622 100644 --- a/assets/aws/Makefile +++ b/assets/aws/Makefile @@ -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