Skip to content

Commit 86a12fb

Browse files
committed
Merge branch 'trunk' into objc2-metal
2 parents 42b4a97 + fac49ee commit 86a12fb

File tree

377 files changed

+30895
-26389
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

377 files changed

+30895
-26389
lines changed

.github/dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ updates:
77
interval: weekly
88
# This allows dependabot to update _all_ lockfile packages.
99
#
10-
# These will be grouped into the existing group update PRs, so shoudn't generate additional jobs.
10+
# These will be grouped into the existing group update PRs, so shouldn't generate additional jobs.
1111
allow:
1212
# Allow both direct and indirect updates for all packages
1313
- dependency-type: "all"

.github/workflows/ci.yml

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,11 @@ env:
3333
#
3434
# In order to prevent CI regressions, we pin the nightly version.
3535
NIGHTLY_VERSION: "nightly-2023-12-17"
36-
# Version of rust used to build the docs with.
37-
#
38-
# This needs to be newer to work around https://github.com/gfx-rs/wgpu/issues/4905.
39-
#
40-
# Once 1.76 coes out, we can use that instead of nightly.
41-
DOCS_RUST_VERSION: "nightly-2023-12-17"
4236
# This is the MSRV used by `wgpu` itself and all surrounding infrastructure.
4337
REPO_MSRV: "1.76"
4438
# This is the MSRV used by the `wgpu-core`, `wgpu-hal`, and `wgpu-types` crates,
4539
# to ensure that they can be used with firefox.
46-
CORE_MSRV: "1.74"
40+
CORE_MSRV: "1.76"
4741

4842
#
4943
# Environment variables
@@ -59,6 +53,7 @@ env:
5953
RUSTDOCFLAGS: -D warnings
6054
WASM_BINDGEN_TEST_TIMEOUT: 300 # 5 minutes
6155
CACHE_SUFFIX: c # cache busting
56+
WGPU_TESTING: true
6257

6358
# We distinguish the following kinds of builds:
6459
# - native: build for the same target as we compile on
@@ -149,12 +144,6 @@ jobs:
149144
rustup override set ${{ env.REPO_MSRV }}
150145
cargo -V
151146
152-
# Use special toolchain for rustdoc, see https://github.com/gfx-rs/wgpu/issues/4905
153-
# - name: Install Rustdoc Toolchain
154-
# run: |
155-
# rustup toolchain install ${{ env.DOCS_RUST_VERSION }} --no-self-update --profile=minimal --component rust-docs --target ${{ matrix.target }}
156-
# cargo +${{ env.DOCS_RUST_VERSION }} -V
157-
158147
- name: disable debug
159148
shell: bash
160149
run: |
@@ -195,11 +184,11 @@ jobs:
195184
# build for WebGPU
196185
cargo clippy --target ${{ matrix.target }} --tests --features glsl,spirv,fragile-send-sync-non-atomic-wasm
197186
cargo clippy --target ${{ matrix.target }} --tests --features glsl,spirv
198-
# cargo +${{ env.DOCS_RUST_VERSION }} doc --target ${{ matrix.target }} --no-deps --features glsl,spirv
187+
cargo doc --target ${{ matrix.target }} --no-deps --features glsl,spirv
199188
200189
# all features
201190
cargo clippy --target ${{ matrix.target }} --tests --all-features
202-
# cargo +${{ env.DOCS_RUST_VERSION }} doc --target ${{ matrix.target }} --no-deps --all-features
191+
cargo doc --target ${{ matrix.target }} --no-deps --all-features
203192
204193
- name: check em
205194
if: matrix.kind == 'em'
@@ -229,13 +218,16 @@ jobs:
229218
cargo clippy --target ${{ matrix.target }} --tests --benches --all-features
230219
231220
# build docs
232-
# cargo +${{ env.DOCS_RUST_VERSION }} doc --target ${{ matrix.target }} --all-features --no-deps
221+
cargo doc --target ${{ matrix.target }} --all-features --no-deps
222+
223+
# wgpu-core docs are not feasible due to <https://github.com/gfx-rs/wgpu/issues/4905>
224+
#
233225
# - name: check private item docs
234226
# if: matrix.kind == 'native'
235227
# shell: bash
236228
# run: |
237229
# set -e
238-
230+
#
239231
# # wgpu_core package
240232
# cargo +${{ env.DOCS_RUST_VERSION }} doc --target ${{ matrix.target }} \
241233
# --package wgpu-core \
@@ -568,6 +560,7 @@ jobs:
568560
if: steps.coverage.outcome == 'success'
569561
with:
570562
files: lcov.info
563+
token: ${{ secrets.CODECOV_TOKEN }}
571564

572565
doctest:
573566
# runtime is normally 2 minutes
@@ -628,7 +621,7 @@ jobs:
628621
cargo fmt --manifest-path xtask/Cargo.toml -- --check
629622
630623
- name: Check for typos
631-
uses: crate-ci/typos@v1.22.7
624+
uses: crate-ci/typos@v1.23.6
632625

633626
check-cts-runner:
634627
# runtime is normally 2 minutes
@@ -677,7 +670,7 @@ jobs:
677670
uses: actions/checkout@v4
678671

679672
- name: Run `cargo deny check`
680-
uses: EmbarkStudios/cargo-deny-action@v1
673+
uses: EmbarkStudios/cargo-deny-action@v2
681674
with:
682675
command: check advisories
683676
arguments: --all-features --workspace
@@ -694,7 +687,7 @@ jobs:
694687
uses: actions/checkout@v4
695688

696689
- name: Run `cargo deny check`
697-
uses: EmbarkStudios/cargo-deny-action@v1
690+
uses: EmbarkStudios/cargo-deny-action@v2
698691
with:
699692
command: check bans licenses sources
700693
arguments: --all-features --workspace

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
if: ${{ failure() }}
4242

4343
- name: Deploy the docs
44-
uses: JamesIves/[email protected].1
44+
uses: JamesIves/[email protected].3
4545
if: github.ref == 'refs/heads/trunk'
4646
with:
4747
token: ${{ secrets.WEB_DEPLOY }}

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
run: cargo xtask run-wasm --no-serve
4242

4343
- name: Deploy WebGPU examples
44-
uses: JamesIves/[email protected].1
44+
uses: JamesIves/[email protected].3
4545
if: github.ref == 'refs/heads/trunk'
4646
with:
4747
token: ${{ secrets.WEB_DEPLOY }}

0 commit comments

Comments
 (0)