From 012538eadf92cd87053bd4f35be85b7414b9a0ef Mon Sep 17 00:00:00 2001
From: Andrey Zgarbul <zgarbul.andrey@gmail.com>
Date: Mon, 2 Oct 2023 12:11:10 +0300
Subject: [PATCH] enable merge-queue

---
 .github/bors.toml              | 10 ----------
 .github/workflows/ci.yaml      | 12 +++++++++++-
 .github/workflows/rust-ci.yaml | 12 +++++++++++-
 3 files changed, 22 insertions(+), 12 deletions(-)
 delete mode 100644 .github/bors.toml

diff --git a/.github/bors.toml b/.github/bors.toml
deleted file mode 100644
index 3aeda2fb..00000000
--- a/.github/bors.toml
+++ /dev/null
@@ -1,10 +0,0 @@
-required_approvals = 1
-block_labels = ["wip"]
-delete_merged_branches = true
-status = [
-    "Test",
-    "Check (esp32)",
-    "Check (esp8266)",
-    "Check (stm32)",
-    "Check (lpc55)",
-]
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 7d229570..92696c53 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -5,10 +5,20 @@ env:
 
 on:
   push:
-    branches: [ staging, trying, master ]
+    branches: master
   pull_request:
+  merge_group:
 
 jobs:
+  python-ci:
+    name: Python-CI
+    runs-on: ubuntu-latest
+    needs: [test, check]
+    if: always()
+    steps:
+      - name: Done
+        run: jq --exit-status 'all(.result == "success")' <<< '${{ toJson(needs) }}'
+
   test:
     name: Test
     runs-on: ubuntu-latest
diff --git a/.github/workflows/rust-ci.yaml b/.github/workflows/rust-ci.yaml
index f701c663..ff882ffd 100644
--- a/.github/workflows/rust-ci.yaml
+++ b/.github/workflows/rust-ci.yaml
@@ -5,10 +5,20 @@ env:
 
 on:
   push:
-    branches: [ staging, trying, master ]
+    branches: master
   pull_request:
+  merge_group:
 
 jobs:
+  rust-ci:
+    name: Rust-CI
+    runs-on: ubuntu-latest
+    needs: [build, test, test_convert, clippy, format, check]
+    if: always()
+    steps:
+      - name: Done
+        run: jq --exit-status 'all(.result == "success")' <<< '${{ toJson(needs) }}'
+
   build:
     name: Build
     runs-on: ubuntu-latest