Skip to content

Commit 2da8f00

Browse files
committed
Remove remaining GitHub actions FIXMEs.
1 parent c39bd42 commit 2da8f00

1 file changed

Lines changed: 6 additions & 31 deletions

File tree

.github/workflows/ci.yml

Lines changed: 6 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -43,24 +43,15 @@ jobs:
4343
toolchain: nightly
4444
components: clippy
4545

46-
- # FIXME: Switch back when actions-rs/cargo#217 gets merged
47-
uses: r3-os/actions-rust-cargo@fb222fe18dc90e381546d012f9e3d6f353f0f627
48-
with:
49-
command: clippy
50-
args: -- -D warnings
46+
- run: cargo clippy -- -D warnings
5147

5248
coverage:
5349
name: Coverage
5450
runs-on: ubuntu-latest
5551
timeout-minutes: 10
5652
steps:
5753
- uses: actions/checkout@v3
58-
- # FIXME: Switch back when actions-rs/toolchain#{209,220,222} is merged
59-
uses: r3-os/actions-rust-toolchain@a862b6623c178b43a3135516442a5f72fb5c1877
60-
with:
61-
profile: minimal
62-
toolchain: nightly
63-
override: true
54+
- uses: dtolnay/rust-toolchain@stable
6455

6556
- name: tarpaulin Cache
6657
id: tarpaulin_cache
@@ -69,19 +60,11 @@ jobs:
6960
path: ~/.cargo/bin/cargo-tarpaulin
7061
key: ${{ runner.os }}-cargo-tarpaulin
7162

72-
- # FIXME: Switch back when actions-rs/cargo#217 gets merged
73-
uses: r3-os/actions-rust-cargo@fb222fe18dc90e381546d012f9e3d6f353f0f627
63+
- run: cargo install cargo-tarpaulin
7464
if: steps.tarpaulin_cache.outputs.cache-hit != 'true'
75-
with:
76-
command: install
77-
args: cargo-tarpaulin
7865

7966
- name: 'Run `cargo-tarpaulin`'
80-
# FIXME: Switch back when actions-rs/cargo#217 gets merged
81-
uses: r3-os/actions-rust-cargo@fb222fe18dc90e381546d012f9e3d6f353f0f627
82-
with:
83-
command: tarpaulin
84-
args: --workspace
67+
run: cargo tarpaulin --workspace
8568

8669
- name: Upload to codecov.io
8770
uses: codecov/codecov-action@v1
@@ -96,11 +79,7 @@ jobs:
9679
- uses: actions/checkout@v3
9780
- uses: dtolnay/rust-toolchain@stable
9881

99-
- # FIXME: Switch back when actions-rs/cargo#217 gets merged
100-
uses: r3-os/actions-rust-cargo@fb222fe18dc90e381546d012f9e3d6f353f0f627
101-
with:
102-
command: test
103-
args: --release
82+
- run: cargo test --release
10483

10584
build_and_test_windows:
10685
name: Build and Test (Windows)
@@ -113,8 +92,4 @@ jobs:
11392
- uses: actions/checkout@v3
11493
- uses: dtolnay/rust-toolchain@stable
11594

116-
- # FIXME: Switch back when actions-rs/cargo#217 gets merged
117-
uses: r3-os/actions-rust-cargo@fb222fe18dc90e381546d012f9e3d6f353f0f627
118-
with:
119-
command: test
120-
args: --release
95+
- run: cargo test --release

0 commit comments

Comments
 (0)