Skip to content

Commit c259ebc

Browse files
bors[bot]cuviper
andauthored
Merge #52
52: Update and simplify the CI workflow r=cuviper a=cuviper - Update to actions/checkout@v3 - Switch from actions-rs/toolchain to dtolnay/rust-toolchain - Switch from actions-rs/cargo to plain run - Stop explicitly naming CI steps Co-authored-by: Josh Stone <cuviper@gmail.com>
2 parents 61a6e52 + 9beade3 commit c259ebc

File tree

3 files changed

+23
-74
lines changed

3 files changed

+23
-74
lines changed

.github/workflows/ci.yaml

Lines changed: 12 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -14,58 +14,32 @@ jobs:
1414
matrix:
1515
rust: [1.31.0, stable, beta, nightly]
1616
steps:
17-
- name: Rust install
18-
uses: actions-rs/toolchain@v1
17+
- uses: actions/checkout@v3
18+
- uses: dtolnay/rust-toolchain@master
1919
with:
2020
toolchain: ${{ matrix.rust }}
21-
profile: minimal
22-
override: true
23-
- name: Checkout
24-
uses: actions/checkout@v2
25-
- name: Build
26-
uses: actions-rs/cargo@v1
27-
with:
28-
command: build
29-
- name: Test
30-
run: ./ci/test_full.sh
21+
- run: cargo build
22+
- run: ./ci/test_full.sh
3123

3224
# try a target that doesn't have std at all
3325
no_std:
3426
name: No Std
3527
runs-on: ubuntu-latest
3628
steps:
37-
- name: Rust install
38-
uses: actions-rs/toolchain@v1
29+
- uses: actions/checkout@v3
30+
- uses: dtolnay/rust-toolchain@stable
3931
with:
40-
toolchain: stable
41-
profile: minimal
42-
override: true
4332
target: thumbv6m-none-eabi
44-
- name: Checkout
45-
uses: actions/checkout@v1
46-
- name: Build
47-
uses: actions-rs/cargo@v1
48-
with:
49-
command: build
50-
# This test crate is intentionally separate, because we need
51-
# independent features for no-std. (rust-lang/cargo#2589)
52-
args: --target thumbv6m-none-eabi --manifest-path ci/check/Cargo.toml
33+
- run: cargo build --target thumbv6m-none-eabi --manifest-path ci/check/Cargo.toml
34+
# This test crate is intentionally separate, because we need
35+
# independent features for no-std. (rust-lang/cargo#2589)
5336

5437
fmt:
5538
name: Format
5639
runs-on: ubuntu-latest
5740
steps:
58-
- name: Rust install
59-
uses: actions-rs/toolchain@v1
41+
- uses: actions/checkout@v3
42+
- uses: dtolnay/rust-toolchain@1.62.0
6043
with:
61-
toolchain: 1.42.0
62-
profile: minimal
63-
override: true
6444
components: rustfmt
65-
- name: Checkout
66-
uses: actions/checkout@v2
67-
- name: Check formatting
68-
uses: actions-rs/cargo@v1
69-
with:
70-
command: fmt
71-
args: --all -- --check
45+
- run: cargo fmt --all --check

.github/workflows/master.yaml

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,9 @@ jobs:
1515
matrix:
1616
rust: [1.31.0, stable]
1717
steps:
18-
- name: Rust install
19-
uses: actions-rs/toolchain@v1
18+
- uses: actions/checkout@v3
19+
- uses: dtolnay/rust-toolchain@master
2020
with:
2121
toolchain: ${{ matrix.rust }}
22-
profile: minimal
23-
override: true
24-
- name: Checkout
25-
uses: actions/checkout@v2
26-
- name: Build
27-
uses: actions-rs/cargo@v1
28-
with:
29-
command: build
30-
- name: Test
31-
run: ./ci/test_full.sh
22+
- run: cargo build
23+
- run: ./ci/test_full.sh

.github/workflows/pr.yaml

Lines changed: 7 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -11,36 +11,19 @@ jobs:
1111
matrix:
1212
rust: [1.31.0, stable]
1313
steps:
14-
- name: Rust install
15-
uses: actions-rs/toolchain@v1
14+
- uses: actions/checkout@v3
15+
- uses: dtolnay/rust-toolchain@master
1616
with:
1717
toolchain: ${{ matrix.rust }}
18-
profile: minimal
19-
override: true
20-
- name: Checkout
21-
uses: actions/checkout@v2
22-
- name: Build
23-
uses: actions-rs/cargo@v1
24-
with:
25-
command: build
26-
- name: Test
27-
run: ./ci/test_full.sh
18+
- run: cargo build
19+
- run: ./ci/test_full.sh
2820

2921
fmt:
3022
name: Format
3123
runs-on: ubuntu-latest
3224
steps:
33-
- name: Rust install
34-
uses: actions-rs/toolchain@v1
25+
- uses: actions/checkout@v3
26+
- uses: dtolnay/rust-toolchain@1.62.0
3527
with:
36-
toolchain: 1.42.0
37-
profile: minimal
38-
override: true
3928
components: rustfmt
40-
- name: Checkout
41-
uses: actions/checkout@v2
42-
- name: Check formatting
43-
uses: actions-rs/cargo@v1
44-
with:
45-
command: fmt
46-
args: --all -- --check
29+
- run: cargo fmt --all --check

0 commit comments

Comments
 (0)