From 09e2958be2a9f821ff3c5fa55adf50011802db3b Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sat, 2 Apr 2022 22:28:10 +0100 Subject: [PATCH] Automatically approve workflow runs from first time contributors (#16775) * Automatically approve workflow runs from first time contributors * Automatically approve workflow runs from first time contributors --- .github/workflows/auto_approve.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/auto_approve.yml b/.github/workflows/auto_approve.yml index d4ca5a47ded3..ed349c74ad34 100644 --- a/.github/workflows/auto_approve.yml +++ b/.github/workflows/auto_approve.yml @@ -19,9 +19,17 @@ jobs: dangerous_files: "lib/python/,Makefile,paths.mk,builddefs/" ======= steps: +<<<<<<< HEAD uses: mheap/automatic-approve-action@v1 with: token: ${{ secrets.QMK_BOT_TOKEN }} workflows: "format.yml,lint.yml,unit_test.yml" dangerous_files: "lib/python/,Makefile,paths.mk,builddefs/" >>>>>>> bebccd1fd0 (Automatically approve workflow runs from first time contributors (#16774)) +======= + - uses: mheap/automatic-approve-action@v1 + with: + token: ${{ secrets.QMK_BOT_TOKEN }} + workflows: "format.yml,lint.yml,unit_test.yml" + dangerous_files: "lib/python/,Makefile,paths.mk,builddefs/" +>>>>>>> c692102e24 (Automatically approve workflow runs from first time contributors (#16775))