merge queue

Author: burrbull

.github/bors.toml

@@ -1,12 +1,22 @@
 on:
   push:
-    branches: [ staging, trying, master ]
+    branches: master
   pull_request:
+  merge_group:
 
 name: Continuous integration
 
 jobs:
   ci:
+    name: CI
+    runs-on: ubuntu-latest
+    needs: [check]
+    if: always()
+    steps:
+      - name: Done
+        run: jq --exit-status 'all(.result == "success")' <<< '${{ toJson(needs) }}'
+
+  check:
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -33,7 +43,7 @@ jobs:
       - uses: actions-rs/cargo@v1
         with:
           command: check
-          args: --features=${{ matrix.mcu }},rt --examples
+          args: --features=${{ matrix.mcu }},rtic,high,stm32-usbd --examples
 
       - uses: actions-rs/cargo@v1
         with:

.github/workflows/ci.yml

@@ -1,4 +1,7 @@
-on: [push, pull_request]
+on:
+  push:
+    branches: master
+  pull_request:
 
 name: Clippy check
 jobs:

.github/workflows/clippy.yml

@@ -1,4 +1,8 @@
-on: [push, pull_request]
+on:
+  push:
+    branches: master
+  pull_request:
+  merge_group:
 
 name: Code formatting check