Skip to content

Commit 425b79e

Browse files
committed
ci: Merge os runs
1 parent af5b65a commit 425b79e

1 file changed

Lines changed: 13 additions & 51 deletions

File tree

.github/workflows/ci.yml

Lines changed: 13 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -12,68 +12,30 @@ concurrency:
1212

1313
jobs:
1414
test:
15-
runs-on: ubuntu-latest
15+
name: Test (${{ matrix.os }}, Rust ${{ matrix.rust }})
16+
runs-on: ${{ matrix.os }}
17+
continue-on-error: ${{ matrix.rust == 'nightly' }}
1618
strategy:
1719
fail-fast: false
1820
matrix:
19-
rust:
20-
- stable
21-
- beta
22-
- nightly
23-
- 1.87.0 # minimum supported version
24-
continue-on-error: ${{ matrix.rust == 'nightly' }}
25-
steps:
26-
- uses: actions/checkout@v6
27-
with:
28-
submodules: recursive
29-
- uses: dtolnay/rust-toolchain@stable
30-
with:
31-
toolchain: ${{ matrix.rust}}
32-
- uses: Swatinem/rust-cache@v2
33-
with:
34-
shared-key: ci-test-${{ runner.os }}-${{ matrix.rust }}
35-
cache-workspace-crates: "true"
36-
- name: Build
37-
run: cargo build --all-features
38-
- name: Cargo Test
39-
run: cargo test --workspace --all-features
40-
- name: Run unit-tests
41-
run: tests/run_all.sh
42-
shell: bash
43-
44-
test-windows:
45-
runs-on: windows-latest
21+
# Linux runs the full Rust version matrix; Windows and macOS test stable only.
22+
os: [ubuntu-latest]
23+
rust: [stable, beta, nightly, "1.87.0"]
24+
include:
25+
- os: windows-latest
26+
rust: stable
27+
- os: macos-latest
28+
rust: stable
4629
steps:
4730
- uses: actions/checkout@v6
4831
with:
4932
submodules: recursive
5033
- uses: dtolnay/rust-toolchain@stable
5134
with:
52-
toolchain: stable
53-
- uses: Swatinem/rust-cache@v2
54-
with:
55-
shared-key: ci-test-windows-${{ runner.os }}-stable
56-
cache-workspace-crates: "true"
57-
- name: Build
58-
run: cargo build --all-features
59-
- name: Cargo Test
60-
run: cargo test --workspace --all-features
61-
- name: Run unit-tests
62-
run: tests/run_all.sh
63-
shell: bash
64-
65-
test-macos:
66-
runs-on: macos-latest
67-
steps:
68-
- uses: actions/checkout@v6
69-
with:
70-
submodules: recursive
71-
- uses: dtolnay/rust-toolchain@stable
72-
with:
73-
toolchain: stable
35+
toolchain: ${{ matrix.rust }}
7436
- uses: Swatinem/rust-cache@v2
7537
with:
76-
shared-key: ci-test-macos-${{ runner.os }}-stable
38+
shared-key: ci-test-${{ matrix.os }}-${{ matrix.rust }}
7739
cache-workspace-crates: "true"
7840
- name: Build
7941
run: cargo build --all-features

0 commit comments

Comments
 (0)