From badaaed16490a9b7804fa0386e30d7acdada29b4 Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Wed, 1 May 2024 23:10:36 -0400 Subject: [PATCH 1/2] auto enable auto merge --- .github/workflows/auto-merge-enable.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 .github/workflows/auto-merge-enable.yml diff --git a/.github/workflows/auto-merge-enable.yml b/.github/workflows/auto-merge-enable.yml new file mode 100644 index 000000000..4507f0b1f --- /dev/null +++ b/.github/workflows/auto-merge-enable.yml @@ -0,0 +1,15 @@ +name: Auto-Merge +on: + pull_request_target: + types: [labeled] + +jobs: + enable-auto-merge: + runs-on: ubuntu-latest + + # Specifically check that dependabot (or another trusted party) created this pull-request, and that it has been labelled correctly. + if: github.event.pull_request.user.login == 'blshkv' || github.event.pull_request.user.login == 'ZeroChaos-' + steps: + - uses: alexwilson/enable-github-automerge-action@main + with: + github-token: "${{ secrets.GITHUB_TOKEN }}" From 90f95a106bf0a5bfd7682d54051357ac67b40542 Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Wed, 1 May 2024 23:13:11 -0400 Subject: [PATCH 2/2] no label needed for auto-merge --- .github/workflows/auto-merge-enable.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/auto-merge-enable.yml b/.github/workflows/auto-merge-enable.yml index 4507f0b1f..e5cfd3f21 100644 --- a/.github/workflows/auto-merge-enable.yml +++ b/.github/workflows/auto-merge-enable.yml @@ -1,7 +1,6 @@ name: Auto-Merge on: pull_request_target: - types: [labeled] jobs: enable-auto-merge: