From 8e558727f682c03de2bf0833dd0786cd906eb9df Mon Sep 17 00:00:00 2001
From: Ulrik Sverdrup <bluss@users.noreply.github.com>
Date: Sat, 9 Mar 2024 15:18:30 +0100
Subject: [PATCH] ci: Use merge queue

---
 .github/workflows/{ci.yml => merge-check.yml} | 23 ++---------------
 .github/workflows/pr-check.yml                | 25 +++++++++++++++++++
 2 files changed, 27 insertions(+), 21 deletions(-)
 rename .github/workflows/{ci.yml => merge-check.yml} (71%)
 create mode 100644 .github/workflows/pr-check.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/merge-check.yml
similarity index 71%
rename from .github/workflows/ci.yml
rename to .github/workflows/merge-check.yml
index 67d9dc50b..87c6de597 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/merge-check.yml
@@ -1,10 +1,7 @@
 on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
+  merge_group:
 
-name: Continuous integration
+name: Merge Queue Check
 
 env:
   CARGO_TERM_COLOR: always
@@ -35,7 +32,6 @@ jobs:
 
   cross_test:
     runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/master'
     strategy:
       matrix:
         include:
@@ -54,18 +50,3 @@ jobs:
       - name: Install cross
         run: cargo install cross
       - run: ./scripts/cross-tests.sh "docs" ${{ matrix.rust }} ${{ matrix.target }}
-
-  clippy:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        rust:
-          - beta
-    steps:
-      - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: ${{ matrix.rust }}
-          components: clippy
-      - uses: Swatinem/rust-cache@v2
-      - run: cargo clippy --features docs
diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml
new file mode 100644
index 000000000..78760d306
--- /dev/null
+++ b/.github/workflows/pr-check.yml
@@ -0,0 +1,25 @@
+on:
+  pull_request:
+  merge_group:
+
+name: PR Check
+
+env:
+  CARGO_TERM_COLOR: always
+  RUSTFLAGS: "-D warnings"
+
+jobs:
+  clippy:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        rust:
+          - beta
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: ${{ matrix.rust }}
+          components: clippy
+      - uses: Swatinem/rust-cache@v2
+      - run: cargo clippy --features docs