Switch from Bors-NG to GitHub merge queues

rayon-rs · Dec 13, 2023 · d3b141c · d3b141c
1 parent d1b18e6
commit d3b141c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 23 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -1,9 +1,5 @@
 name: CI
-on:
-  push:
-    branches:
-      - staging
-      - trying
+on: merge_group
 
 jobs:
 
@@ -93,3 +89,9 @@ jobs:
         with:
           components: rustfmt
       - run: cargo fmt --all --check
+
+  done:
+    name: Complete
+    needs: [check, test, demo, i686, wasm, fmt]
+    steps:
+      - run: exit 0
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -36,3 +36,9 @@ jobs:
         with:
           components: rustfmt
       - run: cargo fmt --all --check
+
+  done:
+    name: Complete
+    needs: [check, test, fmt]
+    steps:
+      - run: exit 0
diff --git a/Cargo.toml b/Cargo.toml
@@ -12,7 +12,7 @@ documentation = "https://docs.rs/rayon/"
 readme = "README.md"
 keywords = ["parallel", "thread", "concurrency", "join", "performance"]
 categories = ["concurrency"]
-exclude = ["/ci/*", "/scripts/*", "/.github/*", "/bors.toml"]
+exclude = ["/ci/*", "/scripts/*", "/.github/*"]
 
 [workspace]
 members = ["rayon-demo", "rayon-core"]

diff --git a/bors.toml b/bors.toml