From 3034e504f2eba6c47ba5417f0cb029c9b01d352a Mon Sep 17 00:00:00 2001 From: Paul Date: Thu, 4 May 2023 22:40:49 -0500 Subject: [PATCH 1/4] Publish examples to wgpu.rs on updates to trunk branch instead of gecko Fixes #3684 --- .github/workflows/publish.yml | 8 +++++--- CHANGELOG.md | 6 ++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 20adf8ccd7..df7018a866 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -3,7 +3,7 @@ name: Publish on: push: branches: - - gecko + - trunk env: CARGO_INCREMENTAL: false @@ -21,10 +21,12 @@ jobs: persist-credentials: false - name: Install Rust WASM target - run: rustup target add wasm32-unknown-unknown + uses: dtolnay/rust-toolchain@stable + with: + targets: wasm32-unknown-unknown - name: Install wasm-bindgen-cli - run: cargo install wasm-bindgen-cli --version=0.2.83 + run: cargo install wasm-bindgen-cli --version=0.2.84 - name: Build WebGPU examples run: cargo build --package wgpu --release --target wasm32-unknown-unknown --examples diff --git a/CHANGELOG.md b/CHANGELOG.md index 0d042c06be..b9e97e72fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -53,6 +53,12 @@ Bottom level categories: - Fix crash on dropping `wgpu::CommandBuffer`. By @wumpf in [#3726](https://github.com/gfx-rs/wgpu/pull/3726). - Use `u32`s internally for bind group indices, rather than `u8`. By @ErichDonGubler in [#3743](https://github.com/gfx-rs/wgpu/pull/3743). +### Examples + +#### General + +- Publish examples to wgpu.rs on updates to trunk branch instead of gecko. By @paul-hansen in [#3750](https://github.com/gfx-rs/wgpu/pull/3750) + ## v0.16.0 (2023-04-19) ### Major changes From 4bd70272a1c30d3253961f86c643549b745b2561 Mon Sep 17 00:00:00 2001 From: Paul Date: Sun, 7 May 2023 01:59:56 -0500 Subject: [PATCH 2/4] Revert change to how wasm target is added Turns out this wasn't needed to test locally, just needed to use a runner image with rust installed. --- .github/workflows/publish.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index df7018a866..5d156a244d 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -21,9 +21,7 @@ jobs: persist-credentials: false - name: Install Rust WASM target - uses: dtolnay/rust-toolchain@stable - with: - targets: wasm32-unknown-unknown + run: rustup target add wasm32-unknown-unknown - name: Install wasm-bindgen-cli run: cargo install wasm-bindgen-cli --version=0.2.84 From 0d0b6d16672395edbb2919c1bf4b4256f76645be Mon Sep 17 00:00:00 2001 From: Paul Date: Sun, 7 May 2023 02:11:30 -0500 Subject: [PATCH 3/4] Don't build examples using our MSRV Fixes issue with building wasm-bindgen-cli. --- .github/workflows/publish.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 5d156a244d..cf65bf38d2 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -20,6 +20,11 @@ jobs: with: persist-credentials: false + - name: Remove hardcoded MSRV + # Okay to build examples using the latest Rust. + # Fixes issues building wasm-bindgen-cli + run: rm -f rust-toolchain + - name: Install Rust WASM target run: rustup target add wasm32-unknown-unknown From 9c86e4432b01ca4660d714ad87971badea290f0a Mon Sep 17 00:00:00 2001 From: Paul Date: Mon, 8 May 2023 17:40:28 -0500 Subject: [PATCH 4/4] Use +stable when building wasm-bindgen-cli --- .github/workflows/publish.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index cf65bf38d2..bea40f7695 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -20,16 +20,11 @@ jobs: with: persist-credentials: false - - name: Remove hardcoded MSRV - # Okay to build examples using the latest Rust. - # Fixes issues building wasm-bindgen-cli - run: rm -f rust-toolchain - - name: Install Rust WASM target run: rustup target add wasm32-unknown-unknown - name: Install wasm-bindgen-cli - run: cargo install wasm-bindgen-cli --version=0.2.84 + run: cargo +stable install wasm-bindgen-cli --version=0.2.84 - name: Build WebGPU examples run: cargo build --package wgpu --release --target wasm32-unknown-unknown --examples