Skip to content

Commit 6d50d5d

Browse files
bors[bot]cuviper
andauthored
Merge #242
242: 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 1597c1c + 4d559f7 commit 6d50d5d

File tree

3 files changed

+26
-91
lines changed

3 files changed

+26
-91
lines changed

.github/workflows/ci.yaml

Lines changed: 15 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -14,85 +14,45 @@ jobs:
1414
matrix:
1515
rust: [1.8.0, 1.15.0, 1.20.0, 1.26.0, 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
# i586 presents floating point challenges for lack of SSE/SSE2
3325
i586:
3426
name: Test (i586)
3527
runs-on: ubuntu-latest
3628
steps:
37-
- name: System install
38-
run: |
29+
- run: |
3930
sudo apt-get update
4031
sudo apt-get install gcc-multilib
41-
- name: Rust install
42-
uses: actions-rs/toolchain@v1
32+
- uses: actions/checkout@v3
33+
- uses: dtolnay/rust-toolchain@stable
4334
with:
44-
toolchain: stable
45-
profile: minimal
46-
override: true
4735
target: i586-unknown-linux-gnu
48-
- name: Checkout
49-
uses: actions/checkout@v1
50-
- name: Test
51-
uses: actions-rs/cargo@v1
52-
with:
53-
command: test
54-
args: --target i586-unknown-linux-gnu --all-features
36+
- run: cargo test --target i586-unknown-linux-gnu --all-features
5537

5638
# try a target that doesn't have std at all
5739
no_std:
5840
name: No Std
5941
runs-on: ubuntu-latest
6042
steps:
61-
- name: Rust install
62-
uses: actions-rs/toolchain@v1
43+
- uses: actions/checkout@v3
44+
- uses: dtolnay/rust-toolchain@stable
6345
with:
64-
toolchain: stable
65-
profile: minimal
66-
override: true
6746
target: thumbv6m-none-eabi
68-
- name: Checkout
69-
uses: actions/checkout@v1
70-
- name: Build
71-
uses: actions-rs/cargo@v1
72-
with:
73-
command: build
74-
args: --target thumbv6m-none-eabi --no-default-features --features i128
75-
- name: Build (libm)
76-
uses: actions-rs/cargo@v1
77-
with:
78-
command: build
79-
args: --target thumbv6m-none-eabi --no-default-features --features libm
47+
- run: cargo build --target thumbv6m-none-eabi --no-default-features --features i128
48+
- run: cargo build --target thumbv6m-none-eabi --no-default-features --features libm
8049

8150
fmt:
8251
name: Format
8352
runs-on: ubuntu-latest
8453
steps:
85-
- name: Rust install
86-
uses: actions-rs/toolchain@v1
54+
- uses: actions/checkout@v3
55+
- uses: dtolnay/rust-toolchain@1.62.0
8756
with:
88-
toolchain: 1.42.0
89-
profile: minimal
90-
override: true
9157
components: rustfmt
92-
- name: Checkout
93-
uses: actions/checkout@v2
94-
- name: Check formatting
95-
uses: actions-rs/cargo@v1
96-
with:
97-
command: fmt
98-
args: --all -- --check
58+
- 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.8.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.8.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: dtolnay/rust-toolchain@1.62.0
3526
with:
36-
toolchain: 1.42.0
37-
profile: minimal
38-
override: true
3927
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
28+
- uses: actions/checkout@v3
29+
- run: cargo fmt --all --check

0 commit comments

Comments
 (0)