Skip to content

Commit

Permalink
Merge branch 'trunk' of https://github.com/gfx-rs/wgpu into wgpu/master
Browse files Browse the repository at this point in the history
  • Loading branch information
gents83 committed Oct 30, 2023
2 parents c6e1e28 + ac896cf commit b140f6a
Show file tree
Hide file tree
Showing 718 changed files with 133,079 additions and 1,507 deletions.
13 changes: 7 additions & 6 deletions .deny.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
[bans]
multiple-versions = "deny"
skip-tree = [
{ name = "cts_runner" },
{ name = "player" },
{ name = "wgpu-info" },
{ name = "windows-sys", version = "0.45" },
{ name = "winit", version = "0.27.5" },
{ name = "rustc_version", version = "0.2.3" },
]
skip = [
{ name = "wgpu" },
{ name = "fastrand" }
]
wildcards = "deny"

Expand All @@ -21,13 +19,16 @@ allow = [
"ISC",
"MIT",
"MIT-0",
"MPL-2.0",
"Unicode-DFS-2016",
"Zlib",
]

[sources]
allow-git = [
# Waiting on releases; used in examples only
"https://github.com/SiegeEngine/ddsfile",
"https://github.com/Razaekel/noise-rs",

"https://github.com/grovesNL/glow",
"https://github.com/gfx-rs/metal-rs",
]
Expand Down
6 changes: 6 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,9 @@

/cts_runner/ @gfx-rs/deno @gfx-rs/wgpu
/deno_webgpu/ @gfx-rs/deno @gfx-rs/wgpu
/naga/ @gfx-rs/naga
/naga-cli/ @gfx-rs/naga

# We leave the codeowners empty for the changelog, so naga changes
# don't trigger wgpu reviews and vise versa.
/CHANGELOG.md
3 changes: 0 additions & 3 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
blank_issues_enabled: false
contact_links:
- name: Issues with shaders
url: https://github.com/gfx-rs/naga/issues/new/choose
about: Issues with or enhancements for the shader translation.
- name: Question about wgpu
url: https://github.com/gfx-rs/wgpu/discussions/new
about: Any questions about how to use wgpu should go here.
59 changes: 58 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@ on:
env:
CARGO_INCREMENTAL: false
CARGO_TERM_COLOR: always
WGPU_DX12_COMPILER: dxc
RUST_LOG: info
RUST_BACKTRACE: full
RUST_LOG: info #needed to understand what's going on when tests fail
# This is the MSRV used by `wgpu` itself and all surrounding infrastructure.
REPO_MSRV: "1.70"
# This is the MSRV used by the `wgpu-core`, `wgpu-hal`, and `wgpu-types` crates,
Expand Down Expand Up @@ -239,6 +240,52 @@ jobs:
# check wgpu-core with all features. This will also get wgpu-hal and wgpu-types.
cargo check --target ${{ matrix.target }} --all-features -p wgpu-core
naga-minimal-versions:
name: MSRV naga Minimal Versions
runs-on: ubuntu-22.04

steps:
- name: checkout repo
uses: actions/checkout@v4

- name: Install Core MSRV toolchain
run: |
rustup toolchain install ${{ env.CORE_MSRV }} --no-self-update --profile=minimal --component clippy
rustup override set ${{ env.CORE_MSRV }}
cargo -V
- name: Install Nightly toolchain
run: |
rustup toolchain install nightly --no-self-update --profile=minimal --component clippy
cargo +nightly -V
- name: Install cargo-hack
uses: taiki-e/install-action@v2
with:
tool: cargo-hack

- name: disable debug
shell: bash
run: |
mkdir -p .cargo
echo """
[profile.dev]
debug = false" >> .cargo/config.toml
- name: Set Minimal Versions
shell: bash
run: |
set -e
cargo +nightly hack generate-lockfile --remove-dev-deps -Z minimal-versions -p naga -p naga-cli
- name: Clippy
shell: bash
run: |
set -e
cargo clippy --all-features -p naga -p naga-cli
wasm-test:
name: Test WebAssembly
runs-on: ubuntu-latest
Expand Down Expand Up @@ -307,6 +354,10 @@ jobs:
. -> target
xtask -> xtask/target
- name: (windows) install dxc
if: matrix.os == 'windows-2022'
uses: napokue/[email protected]

- name: (windows) install warp
if: matrix.os == 'windows-2022'
shell: bash
Expand Down Expand Up @@ -378,6 +429,9 @@ jobs:
cargo xtask test --llvm-cov
- name: check naga snapshots
run: git diff --exit-code -- naga/tests/out

- uses: actions/upload-artifact@v3
if: always() # We want artifacts even if the tests fail.
with:
Expand All @@ -387,14 +441,17 @@ jobs:
**/*-difference.png
- name: generate coverage report
id: coverage
shell: bash
continue-on-error: true
run: |
set -e
cargo llvm-cov report --lcov --output-path lcov.info
- name: upload coverage report to codecov
uses: codecov/codecov-action@v3
if: steps.coverage.outcome == 'success'
with:
files: lcov.info

Expand Down
96 changes: 0 additions & 96 deletions .github/workflows/cts.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Documentation
name: Docs

on:
push:
Expand Down
Loading

0 comments on commit b140f6a

Please sign in to comment.