Merge pull request #437 from stm32-rs/merge-queue

replace bors with merge queue
stm32-rs · Jul 1, 2023 · 03e45d8 · 03e45d8
2 parents 4e3210b + a6ccc61
commit 03e45d8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 22 deletions.
diff --git a/.github/bors.toml b/.github/bors.toml
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -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:                   # All permutations of {rust, mcu}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Changelog
 
 ## Unreleased
+* bors bot replaced with GH merge queue
 * Update `smoltcp` dependency to `0.9.0`
 * MSRV increased to 1.65.0