Skip to content

Commit d69f345

Browse files
committed
Update workflows
This PR includes changes from: - #332: Use -C rathen than -Z for instrument-coverage - #320: Replace unmaintained actions-rs/toolchain with dtolnay/rust-toolchain@master It also updates actions/cache to v4.
1 parent d72d981 commit d69f345

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

.github/workflows/format.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,9 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Toolchain setup
13-
uses: actions-rs/toolchain@v1
13+
uses: dtolnay/rust-toolchain@master
1414
with:
1515
toolchain: nightly
16-
override: true
1716
components: rustfmt
1817

1918
- uses: actions/checkout@v4

.github/workflows/test.yaml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,33 +23,32 @@ jobs:
2323
steps:
2424
- uses: actions/checkout@v4
2525
- name: Cache cargo registry
26-
uses: actions/cache@v1
26+
uses: actions/cache@v4
2727
with:
2828
path: ~/.cargo/registry
2929
key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }}
3030
- name: Cache cargo index
31-
uses: actions/cache@v1
31+
uses: actions/cache@v4
3232
with:
3333
path: ~/.cargo/git
3434
key: ${{ runner.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }}
3535
- name: Cache cargo binaries
36-
uses: actions/cache@v1
36+
uses: actions/cache@v4
3737
with:
3838
path: ~/.cargo/bin
3939
key: ${{ runner.os }}-cargo-bin-${{ hashFiles('**/Cargo.lock') }}
4040
- name: Toolchain setup
41-
uses: actions-rs/toolchain@v1
41+
uses: dtolnay/rust-toolchain@master
4242
with:
4343
toolchain: nightly
44-
override: true
4544
components: llvm-tools-preview
4645
- name: Install grcov
4746
if: matrix.rust-version == 'nightly' && matrix.cargo-args == '--all-features'
4847
run: if [[ ! -e ~/.cargo/bin/grcov ]]; then cargo install grcov; fi
4948
- name: Run tests
5049
run: cargo test --all-features --no-fail-fast
5150
env:
52-
RUSTFLAGS: '-Zinstrument-coverage'
51+
RUSTFLAGS: '-Cinstrument-coverage'
5352
- name: Run grcov
5453
if: matrix.rust-version == 'nightly' && matrix.cargo-args == '--all-features'
5554
# Important! Keep in grcov flags in sync with Makefile.internal.toml.

0 commit comments

Comments
 (0)