Merge remote-tracking branch 'qmk 0.17.0' into firmware21

4 files changed, 21 insertions, 1 deletions

diff --git a/.github/workflows/auto_approve.yml b/.github/workflows/auto_approve.yml
new file mode 100644
index 0000000000..dea3f017dd
--- /dev/null
+++ b/.github/workflows/auto_approve.yml
@@ -0,0 +1,18 @@
+name: Automatic Approve
+
+on:
+  schedule:
+    - cron: "*/5 * * * *"
+
+jobs:
+  automatic_approve:
+    runs-on: ubuntu-latest
+
+    if: github.repository == 'qmk/qmk_firmware'
+
+    steps:
+    - 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/"
diff --git a/.github/workflows/format.yaml b/.github/workflows/format.yml
index ba0a86aa78..ba0a86aa78 100644
--- a/.github/workflows/format.yaml
+++ b/.github/workflows/format.yml
diff --git a/.github/workflows/format_push.yaml b/.github/workflows/format_push.yml
index 2f5b679499..2f5b679499 100644
--- a/.github/workflows/format_push.yaml
+++ b/.github/workflows/format_push.yml
diff --git a/.github/workflows/unit_test.yml b/.github/workflows/unit_test.yml
index 9e897a2bd9..60d51ce321 100644
--- a/.github/workflows/unit_test.yml
+++ b/.github/workflows/unit_test.yml
@@ -19,11 +19,13 @@ jobs:
   test:
     runs-on: ubuntu-latest
 
-    container: qmkfm/base_container
+    container: qmkfm/qmk_cli
 
     steps:
     - uses: actions/checkout@v2
       with:
         submodules: recursive
+    - name: Install dependencies
+      run: pip3 install -r requirements-dev.txt
     - name: Run tests
       run: make test:all