Skip to content

Commit

Permalink
Merge branch 'trunk' into ray-tracing-new
Browse files Browse the repository at this point in the history
  • Loading branch information
Vecvec authored Oct 1, 2024
2 parents 66e19c3 + 6db0976 commit 689ea8b
Show file tree
Hide file tree
Showing 4 changed files with 55 additions and 46 deletions.
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/[email protected].4
uses: JamesIves/[email protected].8
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/[email protected].4
uses: JamesIves/[email protected].8
if: github.ref == 'refs/heads/trunk'
with:
token: ${{ secrets.WEB_DEPLOY }}
Expand Down
93 changes: 51 additions & 42 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -104,14 +104,14 @@ nanorand = { version = "0.7", default-features = false, features = ["wyrand"] }
noise = { version = "0.8", git = "https://github.com/Razaekel/noise-rs.git", rev = "c6942d4fb70af26db4441edcf41f90fa115333f2" }
nv-flip = "0.1"
obj = "0.10"
once_cell = "1.19.0"
once_cell = "1.20.1"
parking_lot = "0.12.1"
pico-args = { version = "0.5.0", features = [
"eq-separator",
"short-space-opt",
"combined-flags",
] }
png = "0.17.11"
png = "0.17.14"
pollster = "0.3"
profiling = { version = "1", default-features = false }
raw-window-handle = "0.6"
Expand Down

0 comments on commit 689ea8b

Please sign in to comment.