From 9402e48c0ef0bb65c8e6bbdd012e81c99a6341bb Mon Sep 17 00:00:00 2001
From: Josh Stone <cuviper@gmail.com>
Date: Tue, 6 Feb 2024 12:32:46 -0800
Subject: [PATCH 1/3] ci: Switch from bors to merge queues

The success job is copied from how rust-lang/miri-test-libstd does it.
---
 .github/workflows/ci.yaml | 21 ++++++++++++++++-----
 .github/workflows/pr.yaml | 15 +++++++++++++++
 Cargo.toml                |  2 +-
 bors.toml                 |  8 --------
 4 files changed, 32 insertions(+), 14 deletions(-)
 delete mode 100644 bors.toml

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 19cdd28..1c53c23 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:
 
@@ -43,3 +39,18 @@ jobs:
         with:
           components: rustfmt
       - run: cargo fmt --all --check
+
+  # One job that "summarizes" the success state of this pipeline. This can then be added to branch
+  # protection, rather than having to add each job separately.
+  success:
+    name: Success
+    runs-on: ubuntu-latest
+    needs: [test, no_std, fmt]
+    # Github branch protection is exceedingly silly and treats "jobs skipped because a dependency
+    # failed" as success. So we have to do some contortions to ensure the job fails if any of its
+    # dependencies fails.
+    if: always() # make sure this is never "skipped"
+    steps:
+      # Manually check the status of all dependencies. `if: failure()` does not work.
+      - name: check if any dependency failed
+        run: jq --exit-status 'all(.result == "success")' <<< '${{ toJson(needs) }}'
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index e195455..c872a1a 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -27,3 +27,18 @@ jobs:
         with:
           components: rustfmt
       - run: cargo fmt --all --check
+
+  # One job that "summarizes" the success state of this pipeline. This can then be added to branch
+  # protection, rather than having to add each job separately.
+  success:
+    name: Success
+    runs-on: ubuntu-latest
+    needs: [test, fmt]
+    # Github branch protection is exceedingly silly and treats "jobs skipped because a dependency
+    # failed" as success. So we have to do some contortions to ensure the job fails if any of its
+    # dependencies fails.
+    if: always() # make sure this is never "skipped"
+    steps:
+      # Manually check the status of all dependencies. `if: failure()` does not work.
+      - name: check if any dependency failed
+        run: jq --exit-status 'all(.result == "success")' <<< '${{ toJson(needs) }}'
diff --git a/Cargo.toml b/Cargo.toml
index cfa35ab..f349fcf 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,7 +10,7 @@ name = "num-derive"
 repository = "https://github.com/rust-num/num-derive"
 version = "0.4.1"
 readme = "README.md"
-exclude = ["/bors.toml", "/ci/*", "/.github/*"]
+exclude = ["/ci/*", "/.github/*"]
 edition = "2021"
 rust-version = "1.56.0"
 
diff --git a/bors.toml b/bors.toml
deleted file mode 100644
index f44ffa3..0000000
--- a/bors.toml
+++ /dev/null
@@ -1,8 +0,0 @@
-status = [
-  "Test (1.56.0)",
-  "Test (stable)",
-  "Test (beta)",
-  "Test (nightly)",
-  "No Std",
-  "Format",
-]

From d5961e5ac6fbf14d6b8a6994aaa4fa575a99c98b Mon Sep 17 00:00:00 2001
From: Josh Stone <cuviper@gmail.com>
Date: Tue, 6 Feb 2024 12:33:23 -0800
Subject: [PATCH 2/3] ci: Add a registry cache for git protocol

---
 .github/workflows/ci.yaml     | 5 +++++
 .github/workflows/master.yaml | 5 +++++
 .github/workflows/pr.yaml     | 5 +++++
 3 files changed, 15 insertions(+)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 1c53c23..55d1741 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -11,6 +11,11 @@ jobs:
         rust: [1.56.0, stable, beta, nightly]
     steps:
       - uses: actions/checkout@v3
+      - uses: actions/cache@v4
+        if: startsWith(matrix.rust, '1')
+        with:
+          path: ~/.cargo/registry/index
+          key: cargo-${{ matrix.rust }}-git-index
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ matrix.rust }}
diff --git a/.github/workflows/master.yaml b/.github/workflows/master.yaml
index f23d140..b6945b2 100644
--- a/.github/workflows/master.yaml
+++ b/.github/workflows/master.yaml
@@ -16,6 +16,11 @@ jobs:
         rust: [1.56.0, stable]
     steps:
       - uses: actions/checkout@v3
+      - uses: actions/cache@v4
+        if: startsWith(matrix.rust, '1')
+        with:
+          path: ~/.cargo/registry/index
+          key: cargo-${{ matrix.rust }}-git-index
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ matrix.rust }}
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index c872a1a..66cda7d 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -12,6 +12,11 @@ jobs:
         rust: [1.56.0, stable]
     steps:
       - uses: actions/checkout@v3
+      - uses: actions/cache@v4
+        if: startsWith(matrix.rust, '1')
+        with:
+          path: ~/.cargo/registry/index
+          key: cargo-${{ matrix.rust }}-git-index
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ matrix.rust }}

From 7e1321ac6bb05807ae1be4ffdb95936990f1d161 Mon Sep 17 00:00:00 2001
From: Josh Stone <cuviper@gmail.com>
Date: Tue, 6 Feb 2024 12:33:51 -0800
Subject: [PATCH 3/3] 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 55d1741..d32126b 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -10,7 +10,7 @@ jobs:
       matrix:
         rust: [1.56.0, stable, beta, nightly]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/cache@v4
         if: startsWith(matrix.rust, '1')
         with:
@@ -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
@@ -39,7 +39,7 @@ jobs:
     name: Format
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@1.70.0
         with:
           components: rustfmt
diff --git a/.github/workflows/master.yaml b/.github/workflows/master.yaml
index b6945b2..397213d 100644
--- a/.github/workflows/master.yaml
+++ b/.github/workflows/master.yaml
@@ -15,7 +15,7 @@ jobs:
       matrix:
         rust: [1.56.0, stable]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/cache@v4
         if: startsWith(matrix.rust, '1')
         with:
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index 66cda7d..dc3ae2f 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -11,7 +11,7 @@ jobs:
       matrix:
         rust: [1.56.0, stable]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/cache@v4
         if: startsWith(matrix.rust, '1')
         with:
@@ -27,7 +27,7 @@ jobs:
     name: Format
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@1.70.0
         with:
           components: rustfmt