Merge pull request #306 from cuviper/ci-merge

Switch from bors to merge queues
rust-num · Feb 1, 2024 · fbd56f1 · fbd56f1
2 parents 61d9a1b + a8ec422
commit fbd56f1
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 22 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:
 
@@ -71,3 +67,10 @@ jobs:
         with:
           components: rustfmt
       - run: cargo fmt --all --check
+
+  done:
+    name: Complete
+    runs-on: ubuntu-latest
+    needs: [test, i586, no_std, fmt]
+    steps:
+      - run: exit 0
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -27,3 +27,10 @@ jobs:
           components: rustfmt
       - uses: actions/checkout@v4
       - run: cargo fmt --all --check
+
+  done:
+    name: Complete
+    runs-on: ubuntu-latest
+    needs: [test, fmt]
+    steps:
+      - run: exit 0
diff --git a/Cargo.toml b/Cargo.toml
@@ -11,7 +11,7 @@ name = "num-traits"
 version = "0.2.17"
 readme = "README.md"
 build = "build.rs"
-exclude = ["/bors.toml", "/ci/*", "/.github/*"]
+exclude = ["/ci/*", "/.github/*"]
 edition = "2018"
 rust-version = "1.31"
 

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