From aefc4b270c9a8355b223aa53a337961ebd16c4c3 Mon Sep 17 00:00:00 2001
From: Josh Stone <cuviper@gmail.com>
Date: Wed, 31 Jan 2024 17:20:35 -0800
Subject: [PATCH 1/2] Switch from bors to merge queues

---
 .github/workflows/ci.yaml | 13 ++++++++-----
 .github/workflows/pr.yaml |  7 +++++++
 Cargo.toml                |  2 +-
 bors.toml                 |  8 --------
 4 files changed, 16 insertions(+), 14 deletions(-)
 delete mode 100644 bors.toml

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 735f256..1807fb3 100644
--- 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:
 
@@ -46,3 +42,10 @@ jobs:
         with:
           components: rustfmt
       - run: cargo fmt --all --check
+
+  done:
+    name: Complete
+    runs-on: ubuntu-latest
+    needs: [test, no_std, fmt]
+    steps:
+      - run: exit 0
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index d221a73..8efffd7 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -27,3 +27,10 @@ jobs:
         with:
           components: rustfmt
       - 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
index 603ad65..8edecf4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,7 +10,7 @@ repository = "https://github.com/rust-num/num-integer"
 name = "num-integer"
 version = "0.1.45"
 readme = "README.md"
-exclude = ["/bors.toml", "/ci/*", "/.github/*"]
+exclude = ["/ci/*", "/.github/*"]
 edition = "2018"
 rust-version = "1.31"
 
diff --git a/bors.toml b/bors.toml
deleted file mode 100644
index 4c20337..0000000
--- a/bors.toml
+++ /dev/null
@@ -1,8 +0,0 @@
-status = [
-  "Test (1.31.0)",
-  "Test (stable)",
-  "Test (beta)",
-  "Test (nightly)",
-  "No Std",
-  "Format",
-]

From 41a2e8c290a97a3e63eb4bc70ddaaf6fbd5f2c67 Mon Sep 17 00:00:00 2001
From: Josh Stone <cuviper@gmail.com>
Date: Wed, 31 Jan 2024 17:21:14 -0800
Subject: [PATCH 2/2] ci: upgrade to actions/checkout@v4

---
 .github/workflows/ci.yaml     | 6 +++---
 .github/workflows/master.yaml | 2 +-
 .github/workflows/pr.yaml     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 1807fb3..6d4778a 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -15,7 +15,7 @@ jobs:
           nightly,
         ]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ matrix.rust }}
@@ -27,7 +27,7 @@ jobs:
     name: No Std
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
         with:
           target: thumbv6m-none-eabi
@@ -37,7 +37,7 @@ jobs:
     name: Format
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v5
       - uses: dtolnay/rust-toolchain@1.62.0
         with:
           components: rustfmt
diff --git a/.github/workflows/master.yaml b/.github/workflows/master.yaml
index 98e8f8e..c284d89 100644
--- a/.github/workflows/master.yaml
+++ b/.github/workflows/master.yaml
@@ -15,7 +15,7 @@ jobs:
       matrix:
         rust: [1.31.0, stable]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ matrix.rust }}
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index 8efffd7..e51f85d 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -11,7 +11,7 @@ jobs:
       matrix:
         rust: [1.31.0, stable]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ matrix.rust }}
@@ -22,7 +22,7 @@ jobs:
     name: Format
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@1.62.0
         with:
           components: rustfmt