Skip to content

Commit 9a4b33e

Browse files
committed
CI: Move rust_channel matrix dimension ahead of target.
Sort the jobs by Rust toolchain version first. I hope this will encourage GitHub Actions to run all the tests in the order this implies.
1 parent 9844dd6 commit 9a4b33e

File tree

1 file changed

+28
-24
lines changed

1 file changed

+28
-24
lines changed

.github/workflows/ci.yml

+28-24
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,16 @@ jobs:
138138
features:
139139
- # Default
140140

141+
rust_channel:
142+
- stable
143+
# Keep in sync with Cargo.toml and similar `rust_channel` sections.
144+
- 1.61.0 # MSRV
145+
# Early warning for changes in the Rust toolchain that are about to
146+
# break builds on Rust Stable.
147+
- beta
148+
# XXX: `coverage` jobs run on Nightly.
149+
# - nightly
150+
141151
target:
142152
- aarch64-apple-ios
143153
- aarch64-apple-darwin
@@ -163,16 +173,6 @@ jobs:
163173
# `coverage` jobs build in debug mode, so only run in release mode here.
164174
- --release
165175

166-
rust_channel:
167-
- stable
168-
# Keep in sync with Cargo.toml and similar `rust_channel` sections.
169-
- 1.61.0 # MSRV
170-
# Early warning for changes in the Rust toolchain that are about to
171-
# break builds on Rust Stable.
172-
- beta
173-
# XXX: `coverage` jobs run on Nightly.
174-
# - nightly
175-
176176
include:
177177
- target: aarch64-apple-darwin
178178
host_os: macos-14
@@ -372,6 +372,12 @@ jobs:
372372
- --no-default-features
373373
- --features=std,slow_tests
374374

375+
rust_channel:
376+
- stable
377+
- nightly
378+
# Keep in sync with Cargo.toml and similar `rust_channel` sections.
379+
- 1.61.0 # MSRV
380+
375381
target:
376382
- aarch64-unknown-linux-musl
377383
- i686-pc-windows-msvc
@@ -380,12 +386,6 @@ jobs:
380386
mode:
381387
- --release
382388

383-
rust_channel:
384-
- stable
385-
- nightly
386-
# Keep in sync with Cargo.toml and similar `rust_channel` sections.
387-
- 1.61.0 # MSRV
388-
389389
include:
390390
- target: aarch64-unknown-linux-musl
391391
host_os: ubuntu-22.04
@@ -459,15 +459,19 @@ jobs:
459459

460460
host_os:
461461
- ubuntu-22.04
462-
mode:
463-
- # debug
464-
- --release
462+
465463
rust_channel:
466464
- stable
467465
- beta
468466
- nightly
467+
468+
mode:
469+
- # debug
470+
- --release
471+
469472
target:
470473
- wasm32-unknown-unknown
474+
471475
webdriver:
472476
# TODO: Firefox is not in Ubuntu 22.04 images according to
473477
# https://github.com/actions/runner-images/issues/5490 and our
@@ -515,6 +519,11 @@ jobs:
515519
# to be covered without it being enabled.
516520
- --features=std
517521

522+
# Coverage collection is Nightly-only
523+
rust_channel:
524+
# This is the main coverage we have for building with Rust Nightly.
525+
- nightly
526+
518527
# TODO: targets
519528
target:
520529
- aarch64-unknown-linux-gnu # Has assembly
@@ -532,11 +541,6 @@ jobs:
532541
# This is the main coverage we have for debug mode builds.
533542
- # debug
534543

535-
# Coverage collection is Nightly-only
536-
rust_channel:
537-
# This is the main coverage we have for building with Rust Nightly.
538-
- nightly
539-
540544
# TODO: targets
541545
include:
542546
# TODO: Use the -musl target after

0 commit comments

Comments
 (0)