Skip to content

Commit fbd56f1

Browse files
authored
Merge pull request #306 from cuviper/ci-merge
Switch from bors to merge queues
2 parents 61d9a1b + a8ec422 commit fbd56f1

File tree

4 files changed

+16
-22
lines changed

4 files changed

+16
-22
lines changed

.github/workflows/ci.yaml

Lines changed: 8 additions & 5 deletions
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

@@ -71,3 +67,10 @@ jobs:
7167
with:
7268
components: rustfmt
7369
- run: cargo fmt --all --check
70+
71+
done:
72+
name: Complete
73+
runs-on: ubuntu-latest
74+
needs: [test, i586, no_std, fmt]
75+
steps:
76+
- run: exit 0

.github/workflows/pr.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,10 @@ jobs:
2727
components: rustfmt
2828
- uses: actions/checkout@v4
2929
- run: cargo fmt --all --check
30+
31+
done:
32+
name: Complete
33+
runs-on: ubuntu-latest
34+
needs: [test, fmt]
35+
steps:
36+
- run: exit 0

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ name = "num-traits"
1111
version = "0.2.17"
1212
readme = "README.md"
1313
build = "build.rs"
14-
exclude = ["/bors.toml", "/ci/*", "/.github/*"]
14+
exclude = ["/ci/*", "/.github/*"]
1515
edition = "2018"
1616
rust-version = "1.31"
1717

bors.toml

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)