Skip to content

Commit ac0b695

Browse files
authored
Merge pull request #58 from cuviper/ci-merge
Switch from bors to merge queues
2 parents 80c2b22 + 41a2e8c commit ac0b695

File tree

5 files changed

+22
-20
lines changed

5 files changed

+22
-20
lines changed

.github/workflows/ci.yaml

Lines changed: 11 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

@@ -19,7 +15,7 @@ jobs:
1915
nightly,
2016
]
2117
steps:
22-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v4
2319
- uses: dtolnay/rust-toolchain@master
2420
with:
2521
toolchain: ${{ matrix.rust }}
@@ -31,7 +27,7 @@ jobs:
3127
name: No Std
3228
runs-on: ubuntu-latest
3329
steps:
34-
- uses: actions/checkout@v3
30+
- uses: actions/checkout@v4
3531
- uses: dtolnay/rust-toolchain@stable
3632
with:
3733
target: thumbv6m-none-eabi
@@ -41,8 +37,15 @@ jobs:
4137
name: Format
4238
runs-on: ubuntu-latest
4339
steps:
44-
- uses: actions/checkout@v3
40+
- uses: actions/checkout@v5
4541
- uses: dtolnay/[email protected]
4642
with:
4743
components: rustfmt
4844
- run: cargo fmt --all --check
45+
46+
done:
47+
name: Complete
48+
runs-on: ubuntu-latest
49+
needs: [test, no_std, fmt]
50+
steps:
51+
- run: exit 0

.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: 9 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,15 @@ 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+
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
@@ -10,7 +10,7 @@ repository = "https://github.com/rust-num/num-integer"
1010
name = "num-integer"
1111
version = "0.1.45"
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)