Skip to content

Commit 972c609

Browse files
committed
simplify and update CI
1 parent c32e431 commit 972c609

1 file changed

Lines changed: 7 additions & 41 deletions

File tree

.github/workflows/ci.yml

Lines changed: 7 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -15,71 +15,37 @@ jobs:
1515
tests:
1616
name: Tests
1717
runs-on: ${{ matrix.os }}
18-
continue-on-error: ${{ matrix.toolchain == 'nightly' || matrix.toolchain == 'beta' }}
1918
strategy:
2019
fail-fast: false
2120
matrix:
2221
os: [macos-latest, windows-latest, ubuntu-latest]
23-
toolchain: [stable]
2422
include:
2523
- os: macos-latest
2624
MACOS: true
2725
- os: windows-latest
2826
- os: ubuntu-latest
2927
env:
3028
RUST_BACKTRACE: full
31-
RUSTV: ${{ matrix.toolchain }}
3229
steps:
33-
- uses: actions/checkout@v2
30+
- uses: actions/checkout@v6
3431

3532
- name: Install Linux deps alsa and udev
3633
run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev
3734
if: runner.os == 'linux'
3835

39-
- name: install ${{ matrix.toolchain }} toolchain
36+
- name: install stable toolchain
4037
id: install_toolchain
41-
uses: actions-rs/toolchain@v1
38+
uses: actions-rust-lang/setup-rust-toolchain@v1
4239
with:
43-
toolchain: ${{ matrix.toolchain }}
44-
profile: minimal
45-
# Don't use a 'components:' entry--we don't need them with beta/nightly, plus nightly often doesn't have them
46-
override: true
47-
48-
- name: Fetch cargo registry cache
49-
uses: actions/cache@v3
50-
continue-on-error: false
51-
with:
52-
path: |
53-
~/.cargo/bin/
54-
~/.cargo/registry/index/
55-
~/.cargo/registry/cache/
56-
~/.cargo/git/db/
57-
target/
58-
Cargo.lock
59-
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
60-
if: runner.os != 'windows'
61-
62-
- name: Fetch cargo registry cache (windows)
63-
uses: actions/cache@v3
64-
continue-on-error: false
65-
with:
66-
path: |
67-
C:\Rust\.cargo\bin
68-
C:\Rust\.cargo\registry\index
69-
C:\Rust\.cargo\registry\cache
70-
C:\Rust\.cargo\git\db
71-
target
72-
Cargo.lock
73-
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
74-
if: runner.os == 'windows'
40+
components: rustfmt clippy
7541

7642
- name: rustfmt & clippy
7743
run: |
78-
rustup component add clippy rustfmt
7944
cargo clippy --workspace
8045
cargo fmt --all -- --check
81-
if: matrix.toolchain == 'stable' && matrix.os == 'ubuntu-latest'
46+
if: matrix.os == 'ubuntu-latest'
8247

83-
- run: cargo test --workspace --all-targets --all-features
48+
- name: run tests
49+
run: cargo test --workspace --all-targets --all-features
8450
env:
8551
MACOS: ${{ matrix.MACOS }} # Used by some tests

0 commit comments

Comments
 (0)