Skip to content

Commit

Permalink
Merge branch 'gfx-rs:trunk' into CGBmismatch
Browse files Browse the repository at this point in the history
  • Loading branch information
sagudev authored Apr 29, 2024
2 parents 5372fcb + 8597367 commit 6d3c697
Show file tree
Hide file tree
Showing 45 changed files with 1,106 additions and 448 deletions.
3 changes: 2 additions & 1 deletion .deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
multiple-versions = "deny"
skip-tree = [
{ name = "windows-sys", version = "0.45" },
{ name = "winit", version = "0.27.5" },
{ name = "winit", version = "0.27" },
{ name = "winit", version = "0.29" },
{ name = "rustc_version", version = "0.2.3" },
{ name = "sourcemap", version = "7.1.1" },
]
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ jobs:
set -e
# wgpu_core package
cargo +${{ env.DOCS_RUST_VERSION }} doc --target ${{ matrix.target }} --all-features --no-deps --package wgpu-core --document-private-items
cargo +${{ env.DOCS_RUST_VERSION }} doc --target ${{ matrix.target }} --all-features --no-deps --package wgpu-core --package wgpu-hal --document-private-items
# We run minimal checks on the MSRV of the core crates, ensuring that
# its dependency tree does not cause issues for firefox.
Expand Down Expand Up @@ -623,7 +623,7 @@ jobs:
cargo fmt --manifest-path xtask/Cargo.toml -- --check
- name: Check for typos
uses: crate-ci/typos@v1.20.9
uses: crate-ci/typos@v1.20.10

check-cts-runner:
# runtime is normally 2 minutes
Expand Down
202 changes: 113 additions & 89 deletions CHANGELOG.md

Large diffs are not rendered by default.

Loading

0 comments on commit 6d3c697

Please sign in to comment.