Skip to content

Commit e582ad4

Browse files
authored
Merge pull request #25 from cuviper/ci-merge
Switch from bors to merge queues
2 parents 4b09fc1 + 5518b59 commit e582ad4

File tree

5 files changed

+36
-20
lines changed

5 files changed

+36
-20
lines changed

.github/workflows/ci.yaml

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

@@ -14,7 +10,7 @@ jobs:
1410
matrix:
1511
rust: [1.31.0, stable, beta, nightly]
1612
steps:
17-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v4
1814
- uses: dtolnay/rust-toolchain@master
1915
with:
2016
toolchain: ${{ matrix.rust }}
@@ -26,7 +22,7 @@ jobs:
2622
name: No Std
2723
runs-on: ubuntu-latest
2824
steps:
29-
- uses: actions/checkout@v3
25+
- uses: actions/checkout@v4
3026
- uses: dtolnay/rust-toolchain@stable
3127
with:
3228
target: thumbv6m-none-eabi
@@ -36,8 +32,22 @@ jobs:
3632
name: Format
3733
runs-on: ubuntu-latest
3834
steps:
39-
- uses: actions/checkout@v3
35+
- uses: actions/checkout@v4
4036
- uses: dtolnay/[email protected]
4137
with:
4238
components: rustfmt
4339
- run: cargo fmt --all --check
40+
41+
ci-success:
42+
name: Complete
43+
runs-on: ubuntu-latest
44+
needs: [test, no_std, fmt]
45+
steps:
46+
- run: exit 0
47+
ci-failed:
48+
name: Complete
49+
runs-on: ubuntu-latest
50+
needs: [test, no_std, fmt]
51+
if: failure()
52+
steps:
53+
- run: exit 1

.github/workflows/master.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
matrix:
1616
rust: [1.31.0, stable]
1717
steps:
18-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v4
1919
- uses: dtolnay/rust-toolchain@master
2020
with:
2121
toolchain: ${{ matrix.rust }}

.github/workflows/pr.yaml

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
matrix:
1212
rust: [1.31.0, stable]
1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
1515
- uses: dtolnay/rust-toolchain@master
1616
with:
1717
toolchain: ${{ matrix.rust }}
@@ -22,8 +22,22 @@ jobs:
2222
name: Format
2323
runs-on: ubuntu-latest
2424
steps:
25-
- uses: actions/checkout@v3
25+
- uses: actions/checkout@v4
2626
- uses: dtolnay/[email protected]
2727
with:
2828
components: rustfmt
2929
- run: cargo fmt --all --check
30+
31+
ci-success:
32+
name: Complete
33+
runs-on: ubuntu-latest
34+
needs: [test, fmt]
35+
steps:
36+
- run: exit 0
37+
ci-failed:
38+
name: Complete
39+
runs-on: ubuntu-latest
40+
needs: [test, fmt]
41+
if: failure()
42+
steps:
43+
- run: exit 1

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ repository = "https://github.com/rust-num/num-iter"
1010
name = "num-iter"
1111
version = "0.1.43"
1212
readme = "README.md"
13-
exclude = ["/bors.toml", "/ci/*", "/.github/*"]
13+
exclude = ["/ci/*", "/.github/*"]
1414
edition = "2018"
1515
rust-version = "1.31"
1616

bors.toml

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

0 commit comments

Comments
 (0)