Skip to content

Commit 01a4a6e

Browse files
committed
build: Add --locked to Cargo commands in CI
1 parent 51012c3 commit 01a4a6e

File tree

2 files changed

+30
-30
lines changed

2 files changed

+30
-30
lines changed

.github/workflows/ci.yml

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -264,16 +264,16 @@ jobs:
264264
export RUSTFLAGS="$RUSTFLAGS --cfg getrandom_backend=\"wasm_js\""
265265
266266
# build for WebGPU
267-
cargo clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} --tests --features glsl,spirv,fragile-send-sync-non-atomic-wasm
268-
cargo clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} --tests --features glsl,spirv
269-
cargo doc --target ${{ matrix.target }} ${{ matrix.extra-flags }} --no-deps --features glsl,spirv
267+
cargo --locked clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} --tests --features glsl,spirv,fragile-send-sync-non-atomic-wasm
268+
cargo --locked clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} --tests --features glsl,spirv
269+
cargo --locked doc --target ${{ matrix.target }} ${{ matrix.extra-flags }} --no-deps --features glsl,spirv
270270
271271
# check with only the web feature
272-
cargo clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} --no-default-features --features=web
272+
cargo --locked clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} --no-default-features --features=web
273273
274274
# all features
275-
cargo clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} --tests --all-features
276-
cargo doc --target ${{ matrix.target }} ${{ matrix.extra-flags }} --no-deps --all-features
275+
cargo --locked clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} --tests --all-features
276+
cargo --locked doc --target ${{ matrix.target }} ${{ matrix.extra-flags }} --no-deps --all-features
277277
278278
# Building for platforms where the tests do not compile.
279279
- name: Check `wgpu` only
@@ -283,13 +283,13 @@ jobs:
283283
set -e
284284
285285
# check with no features
286-
cargo clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p wgpu -p wgpu-hal --no-default-features
286+
cargo --locked clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p wgpu -p wgpu-hal --no-default-features
287287
288288
# Don't check samples since we use winit in our samples which has dropped support for Emscripten.
289289
290290
# Check with all features.
291-
cargo clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p wgpu-hal --all-features
292-
cargo clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p wgpu --all-features
291+
cargo --locked clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p wgpu-hal --all-features
292+
cargo --locked clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p wgpu --all-features
293293
294294
# Building for no_std platforms.
295295
- name: Check `no_std`
@@ -299,16 +299,16 @@ jobs:
299299
set -e
300300
301301
# check with no features
302-
cargo clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p wgpu-types --no-default-features
303-
cargo clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p naga --no-default-features
304-
cargo clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p wgpu-hal --no-default-features
305-
cargo clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p wgpu --no-default-features
302+
cargo --locked clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p wgpu-types --no-default-features
303+
cargo --locked clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p naga --no-default-features
304+
cargo --locked clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p wgpu-hal --no-default-features
305+
cargo --locked clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p wgpu --no-default-features
306306
307307
# Check with all compatible features
308-
cargo clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p wgpu-types --no-default-features --features strict_asserts,fragile-send-sync-non-atomic-wasm,serde,counters
309-
cargo clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p naga --no-default-features --features dot-out,spv-in,spv-out
310-
cargo clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p wgpu-hal --no-default-features --features fragile-send-sync-non-atomic-wasm
311-
cargo clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p wgpu --no-default-features --features serde
308+
cargo --locked clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p wgpu-types --no-default-features --features strict_asserts,fragile-send-sync-non-atomic-wasm,serde,counters
309+
cargo --locked clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p naga --no-default-features --features dot-out,spv-in,spv-out
310+
cargo --locked clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p wgpu-hal --no-default-features --features fragile-send-sync-non-atomic-wasm
311+
cargo --locked clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p wgpu --no-default-features --features serde
312312
313313
# Building for native platforms with standard tests.
314314
- name: Check native
@@ -318,17 +318,17 @@ jobs:
318318
set -e
319319
320320
# check with no features
321-
cargo clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} --no-default-features
321+
cargo --locked clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} --no-default-features
322322
323323
# Check with all features.
324-
cargo clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} --tests --benches --all-features
324+
cargo --locked clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} --tests --benches --all-features
325325
326326
# Check with all features and profiling macro code.
327327
# If we don't check this then errors inside `profiling::scope!()` will not be caught.
328-
cargo clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} --tests --benches --all-features --features test-build-with-profiling
328+
cargo --locked clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} --tests --benches --all-features --features test-build-with-profiling
329329
330330
# build docs
331-
cargo doc --target ${{ matrix.target }} ${{ matrix.extra-flags }} --all-features --no-deps
331+
cargo --locked doc --target ${{ matrix.target }} ${{ matrix.extra-flags }} --all-features --no-deps
332332
333333
- name: Check private item docs
334334
if: matrix.kind == 'native'
@@ -337,7 +337,7 @@ jobs:
337337
set -e
338338
339339
# wgpu_core package
340-
cargo doc --target ${{ matrix.target }} ${{ matrix.extra-flags }} \
340+
cargo --locked doc --target ${{ matrix.target }} ${{ matrix.extra-flags }} \
341341
--package wgpu-core \
342342
--package wgpu-hal \
343343
--package naga \
@@ -596,14 +596,14 @@ jobs:
596596
export RUST_LOG=trace
597597
598598
# This needs to match the command in xtask/tests.rs
599-
cargo llvm-cov --no-cfg-coverage --no-report run --bin wgpu-info -- -vv
599+
cargo --locked llvm-cov --no-cfg-coverage --no-report run --bin wgpu-info -- -vv
600600
601601
- name: Run tests
602602
shell: bash
603603
run: |
604604
set -e
605605
606-
cargo xtask test --llvm-cov
606+
cargo --locked xtask test --llvm-cov
607607
608608
- name: Check Naga snapshots
609609
# git diff doesn't check untracked files, we need to stage those then compare with HEAD.
@@ -624,7 +624,7 @@ jobs:
624624
run: |
625625
set -e
626626
627-
cargo llvm-cov report --lcov --output-path lcov.info
627+
cargo --locked llvm-cov report --lcov --output-path lcov.info
628628
629629
- name: Upload coverage report to Codecov
630630
uses: codecov/codecov-action@v5
@@ -660,7 +660,7 @@ jobs:
660660
run: |
661661
set -e
662662
663-
cargo test --doc
663+
cargo --locked test --doc
664664
665665
fmt:
666666
# runtime is normally 15 seconds
@@ -680,7 +680,7 @@ jobs:
680680
681681
- name: Run `cargo fmt`
682682
run: |
683-
cargo fmt -- --check
683+
cargo --locked fmt -- --check
684684
685685
- name: Install Taplo
686686
uses: uncenter/setup-taplo@v1
@@ -726,7 +726,7 @@ jobs:
726726

727727
- name: Build Deno
728728
run: |
729-
cargo clippy --manifest-path cts_runner/Cargo.toml
729+
cargo --locked clippy --manifest-path cts_runner/Cargo.toml
730730
731731
# Separate job so that new advisories don't block CI.
732732
#

.github/workflows/cts.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ jobs:
100100

101101
- name: run CTS
102102
shell: bash
103-
run: cargo xtask cts --llvm-cov --backend ${{ matrix.backend }}
103+
run: cargo --locked xtask cts --llvm-cov --backend ${{ matrix.backend }}
104104

105105
- name: Generate coverage report
106106
id: coverage
@@ -109,7 +109,7 @@ jobs:
109109
run: |
110110
set -e
111111
112-
cargo llvm-cov report --lcov --output-path lcov.info
112+
cargo --locked llvm-cov report --lcov --output-path lcov.info
113113
114114
- name: Upload coverage report to Codecov
115115
uses: codecov/codecov-action@v5

0 commit comments

Comments
 (0)