From b23d7b5476268234917c65fb4d96697737d42e5c Mon Sep 17 00:00:00 2001 From: Aseem Bansal Date: Tue, 6 Dec 2022 19:09:13 +0530 Subject: [PATCH 1/2] enable auto-approve and merge for pull bot --- .github/workflows/auto-approve-prs.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .github/workflows/auto-approve-prs.yml diff --git a/.github/workflows/auto-approve-prs.yml b/.github/workflows/auto-approve-prs.yml new file mode 100644 index 0000000000000..f62d3ae6e0703 --- /dev/null +++ b/.github/workflows/auto-approve-prs.yml @@ -0,0 +1,17 @@ +name: Auto approve PRs, enable auto-merge from Pull App + +on: pull_request_target + +jobs: + auto-approve: + runs-on: ubuntu-latest + permissions: + pull-requests: write + if: github.actor == 'pull[bot]' + steps: + - uses: hmarr/auto-approve-action@v3 + enable-auto-merge: + runs-on: ubuntu-latest + requires: auto-approve + steps: + - uses: alexwilson/enable-github-automerge-action@main \ No newline at end of file From 357f8fb1d68c9f12cfa1a1d36dbfc06b44d0be50 Mon Sep 17 00:00:00 2001 From: Aseem Bansal Date: Tue, 6 Dec 2022 19:10:28 +0530 Subject: [PATCH 2/2] ensure MERGE is used --- .github/workflows/auto-approve-prs.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/auto-approve-prs.yml b/.github/workflows/auto-approve-prs.yml index f62d3ae6e0703..1bbcf666a56bf 100644 --- a/.github/workflows/auto-approve-prs.yml +++ b/.github/workflows/auto-approve-prs.yml @@ -14,4 +14,6 @@ jobs: runs-on: ubuntu-latest requires: auto-approve steps: - - uses: alexwilson/enable-github-automerge-action@main \ No newline at end of file + - uses: alexwilson/enable-github-automerge-action@main + with: + merge-method: MERGE \ No newline at end of file