Skip to content

Commit

Permalink
Merge branch 'trunk' into test-framework
Browse files Browse the repository at this point in the history
  • Loading branch information
cwfitzgerald committed Sep 28, 2023
2 parents 2fd5b41 + 57f8757 commit 4ef17b8
Show file tree
Hide file tree
Showing 152 changed files with 8,389 additions and 2,276 deletions.
1 change: 1 addition & 0 deletions .deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ allow = [
[sources]
allow-git = [
"https://github.com/grovesNL/glow",
"https://github.com/gfx-rs/metal-rs",
]
unknown-registry = "deny"
unknown-git = "deny"
Expand Down
6 changes: 4 additions & 2 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
/cts_runner/ @crowlKats
/deno_webgpu/ @crowlKats
* @gfx-rs/wgpu

/cts_runner/ @gfx-rs/deno @gfx-rs/wgpu
/deno_webgpu/ @gfx-rs/deno @gfx-rs/wgpu
26 changes: 12 additions & 14 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ env:
CARGO_TERM_COLOR: always
RUST_LOG: info
RUST_BACKTRACE: full
MSRV: 1.65
MSRV: 1.70
PKG_CONFIG_ALLOW_CROSS: 1 # allow android to work
RUSTFLAGS: --cfg=web_sys_unstable_apis -D warnings
RUSTDOCFLAGS: -Dwarnings
Expand Down Expand Up @@ -93,7 +93,7 @@ jobs:

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

- name: Install MSRV toolchain
run: |
Expand Down Expand Up @@ -138,6 +138,7 @@ jobs:
set -e
# build for WebGPU
cargo clippy --target ${{ matrix.target }} --tests --features glsl,spirv,fragile-send-sync-non-atomic-wasm
cargo clippy --target ${{ matrix.target }} --tests --features glsl,spirv
cargo doc --target ${{ matrix.target }} --no-deps --features glsl,spirv
Expand All @@ -154,11 +155,7 @@ jobs:
# build for Emscripten
cargo clippy --target ${{ matrix.target }} -p wgpu -p wgpu-hal --no-default-features
# build cube example
cargo clippy --target ${{ matrix.target }} --bin cube
# build raw-gles example
cargo clippy --target ${{ matrix.target }} --example raw-gles
# Don't check samples since we use winit in our samples which has dropped support for Emscripten.
# all features
cargo clippy --target ${{ matrix.target }} -p wgpu-hal --all-features
Expand All @@ -184,7 +181,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install wasm-pack
uses: taiki-e/install-action@v2
Expand Down Expand Up @@ -219,7 +216,7 @@ jobs:

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

- name: Install cargo-nextest and cargo-llvm-cov
uses: taiki-e/install-action@v2
Expand Down Expand Up @@ -274,6 +271,7 @@ jobs:
cargo xtask test --llvm-cov
- uses: actions/upload-artifact@v3
if: always() # We want artifacts even if the tests fail.
with:
name: comparison-images
path: |
Expand All @@ -298,7 +296,7 @@ jobs:

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

- name: disable debug
shell: bash
Expand All @@ -325,7 +323,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: run rustfmt
run: |
Expand All @@ -337,7 +335,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install MSRV toolchain
run: |
Expand Down Expand Up @@ -366,7 +364,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Run `cargo deny check`
uses: EmbarkStudios/cargo-deny-action@v1
Expand All @@ -380,7 +378,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Run `cargo deny check`
uses: EmbarkStudios/cargo-deny-action@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:

steps:
- name: checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: wgpu

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

steps:
- name: Checkout the code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
persist-credentials: false

Expand All @@ -39,7 +39,7 @@ jobs:
if: ${{ failure() }}

- name: Deploy the docs
uses: JamesIves/[email protected].2
uses: JamesIves/[email protected].3
with:
token: ${{ secrets.WEB_DEPLOY }}
folder: target/doc
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,18 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout the code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
persist-credentials: false

- name: Install Rust WASM target
run: rustup target add wasm32-unknown-unknown

- name: Install wasm-bindgen-cli
run: cargo +stable install wasm-bindgen-cli --version=0.2.86
run: cargo +stable install wasm-bindgen-cli --version=0.2.87

- name: Pin wasm-bindgen version
run: cargo update -p wasm-bindgen --precise 0.2.86
run: cargo update -p wasm-bindgen --precise 0.2.87

- name: Build WebGPU examples
run: cargo build --release --target wasm32-unknown-unknown
Expand All @@ -41,7 +41,7 @@ jobs:
done
- name: Deploy WebGPU examples
uses: JamesIves/[email protected].2
uses: JamesIves/[email protected].3
if: github.ref == 'refs/heads/trunk'
with:
token: ${{ secrets.WEB_DEPLOY }}
Expand All @@ -64,7 +64,7 @@ jobs:
done
- name: Deploy WebGL examples
uses: JamesIves/[email protected].2
uses: JamesIves/[email protected].3
if: github.ref == 'refs/heads/trunk'
with:
token: ${{ secrets.WEB_DEPLOY }}
Expand Down
Loading

0 comments on commit 4ef17b8

Please sign in to comment.