Skip to content

Commit b93b559

Browse files
kpreidcwfitzgerald
authored andcommitted
Expand minimal-versions CI job to cover all packages, use -Zdirect-minimal-versions, but not deny warnings.
1 parent 9727e75 commit b93b559

File tree

1 file changed

+15
-18
lines changed

1 file changed

+15
-18
lines changed

.github/workflows/ci.yml

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -405,32 +405,29 @@ jobs:
405405
# check `wgpu-core` with all features. This will also get `wgpu-hal` and `wgpu-types`.
406406
cargo check --target ${{ matrix.target }} --all-features -p wgpu-core
407407
408-
naga-minimal-versions:
408+
# Check that the libraries build — but not that there are no warnings or that tests pass -
409+
# with `-Zdirect-minimal-versions` which lowers all dependencies from the workspace packages
410+
# to non-workspace packages to their minimum allowed version.
411+
check-minimal-versions:
409412
# runtime is normally 2 minutes
410413
timeout-minutes: 10
411414

412-
name: MSRV naga Minimal Versions
415+
name: MSRV Minimal Versions
413416
runs-on: ubuntu-22.04
417+
env:
418+
# Override flags to NOT include `-D warnings`, because warnings may be due to harmless problems in deps.
419+
# Also, allow unexpected_cfgs because it is very common and spammy when using old deps.
420+
RUSTFLAGS: -A unexpected_cfgs
414421

415422
steps:
416423
- name: Checkout repo
417424
uses: actions/checkout@v4
418425

419-
- name: Install core MSRV toolchain
420-
run: |
421-
rustup toolchain install ${{ env.CORE_MSRV }} --no-self-update --profile=minimal --component clippy
422-
rustup override set ${{ env.CORE_MSRV }}
423-
cargo -V
424-
425-
- name: Install Nightly toolchain
426+
- name: Install toolchain
426427
run: |
427428
rustup toolchain install ${{ env.REPO_MSRV }} --no-self-update --profile=minimal
428-
cargo +${{ env.REPO_MSRV }} -V
429-
430-
- name: Install `cargo-hack`
431-
uses: taiki-e/install-action@v2
432-
with:
433-
tool: cargo-hack
429+
rustup override set ${{ env.REPO_MSRV }}
430+
cargo -V
434431
435432
- name: Disable debug symbols
436433
shell: bash
@@ -445,16 +442,16 @@ jobs:
445442
run: |
446443
set -e
447444
448-
cargo +${{ env.REPO_MSRV }} hack generate-lockfile --remove-dev-deps -Z minimal-versions -p naga -p naga-cli
445+
cargo +${{ env.REPO_MSRV }} update -Zdirect-minimal-versions
449446
env:
450447
RUSTC_BOOTSTRAP: 1
451448

452-
- name: Run Clippy
449+
- name: Run cargo check
453450
shell: bash
454451
run: |
455452
set -e
456453
457-
cargo clippy --all-features -p naga -p naga-cli
454+
cargo check --all-targets --all-features
458455
459456
wasm-test:
460457
# runtime is normally 2 minutes

0 commit comments

Comments
 (0)