Skip to content

Commit

Permalink
Merge pull request #2 from JMS55/ray-tracing2
Browse files Browse the repository at this point in the history
 Merge commit 'fb3b33d09233140533a9e431256a8690bf4c5d42' from wgpu/trunk into ray-tracing
  • Loading branch information
atlv24 authored May 4, 2024
2 parents 6166c86 + 1aefc53 commit d0238b2
Show file tree
Hide file tree
Showing 219 changed files with 8,533 additions and 2,419 deletions.
6 changes: 5 additions & 1 deletion .deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@
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" },
]
skip = [
{ name = "hlsl-snapshots", version = "0.1.0" },
# Strum uses an old version
{ name = "heck", version = "0.4.0" },
]
wildcards = "deny"
allow-wildcard-paths = true
Expand All @@ -20,6 +23,7 @@ allow = [
"BSD-3-Clause",
"CC0-1.0",
"ISC",
"MPL-2.0",
"MIT",
"MIT-0",
"Unicode-DFS-2016",
Expand Down
1 change: 1 addition & 0 deletions .envrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
use nix
11 changes: 10 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ jobs:
# runtime is normally 2-8 minutes
#
# currently high due to documentation time problems on mac.
# https://github.com/rust-lang/rust/issues/114891
timeout-minutes: 30

strategy:
Expand Down Expand Up @@ -229,6 +230,14 @@ jobs:
# build docs
cargo +${{ env.DOCS_RUST_VERSION }} doc --target ${{ matrix.target }} --all-features --no-deps
- name: check private item docs
if: matrix.kind == 'native'
shell: bash
run: |
set -e
# wgpu_core package
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 @@ -614,7 +623,7 @@ jobs:
cargo fmt --manifest-path xtask/Cargo.toml -- --check
- name: Check for typos
uses: crate-ci/[email protected].8
uses: crate-ci/[email protected].10

check-cts-runner:
# runtime is normally 2 minutes
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
if: ${{ failure() }}

- name: Deploy the docs
uses: JamesIves/github-pages-deploy-action@v4.5.0
uses: JamesIves/github-pages-deploy-action@v4.6.0
if: github.ref == 'refs/heads/trunk'
with:
token: ${{ secrets.WEB_DEPLOY }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
run: cargo xtask run-wasm --no-serve

- name: Deploy WebGPU examples
uses: JamesIves/github-pages-deploy-action@v4.5.0
uses: JamesIves/github-pages-deploy-action@v4.6.0
if: github.ref == 'refs/heads/trunk'
with:
token: ${{ secrets.WEB_DEPLOY }}
Expand Down
246 changes: 163 additions & 83 deletions CHANGELOG.md

Large diffs are not rendered by default.

Loading

0 comments on commit d0238b2

Please sign in to comment.