From 9191f32c37e9a0c73a2938ab785222aa7e97f878 Mon Sep 17 00:00:00 2001 From: Tobias Grothe Date: Fri, 10 Jan 2025 13:13:10 +0100 Subject: [PATCH 1/3] Add Enable Automerge --- .github/workflows/automerge.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 .github/workflows/automerge.yml diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml new file mode 100644 index 0000000..d6dfc83 --- /dev/null +++ b/.github/workflows/automerge.yml @@ -0,0 +1,15 @@ +name: Enable Automerge +on: + pull_request: + branches: + - main +jobs: + Enable-Automerge: + runs-on: ubuntu-latest + if: ${{ (github.actor == 'dependabot[bot]') || (github.actor == 'tgrothe') }} + steps: + - name: Auto Merge + run: gh pr merge --auto --merge "$PR_URL" + env: + PR_URL: ${{ github.event.pull_request.html_url }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 428741a0a30a711d4730f888adb51bd40e02d3dc Mon Sep 17 00:00:00 2001 From: Tobias Grothe Date: Fri, 10 Jan 2025 13:14:34 +0100 Subject: [PATCH 2/3] Add Enable Automerge SQUASH --- .github/workflows/automerge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index d6dfc83..85894d5 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -9,7 +9,7 @@ jobs: if: ${{ (github.actor == 'dependabot[bot]') || (github.actor == 'tgrothe') }} steps: - name: Auto Merge - run: gh pr merge --auto --merge "$PR_URL" + run: gh pr merge --auto --squash "$PR_URL" env: PR_URL: ${{ github.event.pull_request.html_url }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 4b9982cfbfff800e676b92b2bf6bb2b252320274 Mon Sep 17 00:00:00 2001 From: Tobias Grothe Date: Fri, 10 Jan 2025 13:16:53 +0100 Subject: [PATCH 3/3] Add Enable Automerge Permissions --- .github/workflows/automerge.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index 85894d5..c345bcc 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -5,6 +5,7 @@ on: - main jobs: Enable-Automerge: + permissions: write-all runs-on: ubuntu-latest if: ${{ (github.actor == 'dependabot[bot]') || (github.actor == 'tgrothe') }} steps: