Skip to content

Commit bb44f0b

Browse files
Update CI (#707)
* plot/Cargo.toml: Remove outdated CI badges. crates.io doesn't support this and they're outdated anyway. * ci: Update actions. Use `actions/checkout@v3` to remove a warning about old versions of node. Use `dtolay/rust-toolchain` instead of `actions-rs/toolchain` as it is maintained (and `actions-rs` actions are not). This also resolves a number of warnings about deprecated functionality within the GitHub Actions UI. Update one usage of `Swatimem/rust-cache` to v2. The other already was updated. Use `cargo` directly instead of using `actions-rs/cargo` as that action is also unmaintained. * ci: Disable wasi test except on stable. This results in an error when building with 1.64 despite `AsFd` having been added in 1.63. It was fixed in 1.66: rust-lang/rust#103306
1 parent dc2b06c commit bb44f0b

File tree

3 files changed

+22
-46
lines changed

3 files changed

+22
-46
lines changed

.github/workflows/audit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
security_audit:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v1
11+
- uses: actions/checkout@v3
1212
- uses: actions-rs/audit-check@v1
1313
with:
1414
token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/ci.yaml

Lines changed: 21 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -24,63 +24,43 @@ jobs:
2424
steps:
2525
- uses: actions/checkout@v3
2626

27-
- uses: actions-rs/toolchain@v1
27+
- uses: dtolnay/rust-toolchain@master
2828
name: Setup rust toolchain
2929
with:
30-
profile: minimal
3130
toolchain: ${{ matrix.rust }}
32-
override: true
3331
components: rustfmt, clippy
3432

3533
- uses: Swatinem/rust-cache@v2
3634
name: Load dependencies from cache
3735

38-
- uses: actions-rs/cargo@v1
39-
name: Build with stable features
40-
with:
41-
command: build
42-
args: --features stable
36+
- name: Build with stable features
37+
run: cargo build --features stable
4338

44-
- uses: actions-rs/cargo@v1
39+
- name: Build with unstable features
4540
if: ${{ matrix.rust == 'nightly' }}
46-
name: Build with unstable features
47-
with:
48-
command: build
49-
args: --all-features
41+
run: cargo build --all-features
5042

51-
- uses: actions-rs/cargo@v1
52-
name: Build with minimal features
53-
with:
54-
command: build
55-
args: --no-default-features
43+
- name: Build with minimal features
44+
run: cargo build --no-default-features
5645

57-
- uses: actions-rs/cargo@v1
58-
name: Test with stable features
59-
with:
60-
command: test
61-
args: --features stable
46+
- name: Test with stable features
47+
run: cargo test --features stable
6248

63-
- uses: actions-rs/cargo@v1
64-
name: Test with minimal features
65-
with:
66-
command: test
67-
args: --no-default-features
49+
- name: Test with minimal features
50+
run: cargo test --no-default-features
6851

69-
- uses: actions-rs/cargo@v1
70-
name: Check for non-standard formatting
52+
- name: Check for non-standard formatting
7153
if: ${{ matrix.rust == 'stable' }}
72-
with:
73-
command: fmt
74-
args: --all -- --check
54+
run: cargo fmt --all -- --check
7555

76-
- uses: actions-rs/cargo@v1
77-
name: Check for clippy hints
56+
- name: Check for clippy hints
7857
if: ${{ matrix.rust == 'stable' }}
79-
with:
80-
command: clippy
81-
args: -- -D warnings
58+
run: cargo clippy -- -D warnings
8259

60+
# This fails on 1.64, but works on 1.66 and later.
61+
# https://github.com/rust-lang/rust/issues/103306
8362
- name: Test run targeting WASI
63+
if: ${{ matrix.rust == 'stable' }}
8464
run: |
8565
curl https://wasmtime.dev/install.sh -sSf | bash
8666
source ~/.bashrc
@@ -97,16 +77,14 @@ jobs:
9777
- stable
9878

9979
steps:
100-
- uses: actions/checkout@v2
80+
- uses: actions/checkout@v3
10181

102-
- uses: actions-rs/toolchain@v1
82+
- uses: dtolnay/rust-toolchain@master
10383
with:
104-
profile: minimal
10584
toolchain: ${{ matrix.rust }}
106-
override: true
10785
components: rustfmt, clippy
10886

109-
- uses: Swatinem/rust-cache@v1
87+
- uses: Swatinem/rust-cache@v2
11088

11189
- uses: taiki-e/install-action@nextest
11290

plot/Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,4 @@ num-complex = { version = "0.4", default-features = false, features = ["std"] }
2121
rand = "0.8"
2222

2323
[badges]
24-
travis-ci = { repository = "bheisler/criterion.rs" }
25-
appveyor = { repository = "bheisler/criterion.rs", id = "4255ads9ctpupcl2" }
2624
maintenance = { status = "looking-for-maintainer" }

0 commit comments

Comments
 (0)