Skip to content

Commit 4c906e0

Browse files
committed
ci: Switch from bors to merge queues
The success job is copied from how rust-lang/miri-test-libstd does it.
1 parent a78ab81 commit 4c906e0

File tree

4 files changed

+32
-16
lines changed

4 files changed

+32
-16
lines changed

.github/workflows/ci.yaml

+16-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
name: CI
2-
on:
3-
push:
4-
branches:
5-
- staging
6-
- trying
2+
on: merge_group
73

84
jobs:
95

@@ -48,3 +44,18 @@ jobs:
4844
with:
4945
components: rustfmt
5046
- run: cargo fmt --all --check
47+
48+
# One job that "summarizes" the success state of this pipeline. This can then be added to branch
49+
# protection, rather than having to add each job separately.
50+
success:
51+
name: Success
52+
runs-on: ubuntu-latest
53+
needs: [test, no_std, fmt]
54+
# Github branch protection is exceedingly silly and treats "jobs skipped because a dependency
55+
# failed" as success. So we have to do some contortions to ensure the job fails if any of its
56+
# dependencies fails.
57+
if: always() # make sure this is never "skipped"
58+
steps:
59+
# Manually check the status of all dependencies. `if: failure()` does not work.
60+
- name: check if any dependency failed
61+
run: jq --exit-status 'all(.result == "success")' <<< '${{ toJson(needs) }}'

.github/workflows/pr.yaml

+15
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,18 @@ jobs:
2727
with:
2828
components: rustfmt
2929
- run: cargo fmt --all --check
30+
31+
# One job that "summarizes" the success state of this pipeline. This can then be added to branch
32+
# protection, rather than having to add each job separately.
33+
success:
34+
name: Success
35+
runs-on: ubuntu-latest
36+
needs: [test, fmt]
37+
# Github branch protection is exceedingly silly and treats "jobs skipped because a dependency
38+
# failed" as success. So we have to do some contortions to ensure the job fails if any of its
39+
# dependencies fails.
40+
if: always() # make sure this is never "skipped"
41+
steps:
42+
# Manually check the status of all dependencies. `if: failure()` does not work.
43+
- name: check if any dependency failed
44+
run: jq --exit-status 'all(.result == "success")' <<< '${{ toJson(needs) }}'

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ name = "num-complex"
1010
repository = "https://github.com/rust-num/num-complex"
1111
version = "0.4.4"
1212
readme = "README.md"
13-
exclude = ["/bors.toml", "/ci/*", "/.github/*"]
13+
exclude = ["/ci/*", "/.github/*"]
1414
edition = "2018"
1515

1616
[package.metadata.docs.rs]

bors.toml

-10
This file was deleted.

0 commit comments

Comments
 (0)