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 6a8b6906f768e..dabb553ec638a 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