diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index c872c4986..308a93c14 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -2,8 +2,9 @@ name: Publish on: push: - branches: - - trunk + branches: ["*"] + pull_request: + merge_group: env: CARGO_INCREMENTAL: false @@ -24,7 +25,10 @@ jobs: run: rustup target add wasm32-unknown-unknown - name: Install wasm-bindgen-cli - run: cargo +stable install wasm-bindgen-cli --version=0.2.84 + run: cargo +stable install wasm-bindgen-cli --version=0.2.86 + + - name: Pin wasm-bindgen version + run: cargo update -p wasm-bindgen --precise 0.2.86 - name: Build WebGPU examples run: cargo build --release --target wasm32-unknown-unknown @@ -38,6 +42,7 @@ jobs: - name: Deploy WebGPU examples uses: JamesIves/github-pages-deploy-action@v4.4.2 + if: github.ref == 'refs/heads/trunk' with: token: ${{ secrets.WEB_DEPLOY }} folder: target/generated-gpu @@ -60,6 +65,7 @@ jobs: - name: Deploy WebGL examples uses: JamesIves/github-pages-deploy-action@v4.4.2 + if: github.ref == 'refs/heads/trunk' with: token: ${{ secrets.WEB_DEPLOY }} folder: target/generated-gl diff --git a/Cargo.toml b/Cargo.toml index 28e4ac9f5..fb2f0e232 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -127,7 +127,7 @@ glutin = "0.29.1" console_error_panic_hook = "0.1.7" console_log = "0.2" js-sys = "0.3.63" -wasm-bindgen = "0.2.84" +wasm-bindgen = "0.2.86" wasm-bindgen-futures = "0.4.34" wasm-bindgen-test = "0.3" web-sys = "0.3.61" diff --git a/wgpu-hal/Cargo.toml b/wgpu-hal/Cargo.toml index 9b194a68e..98d06e8ec 100644 --- a/wgpu-hal/Cargo.toml +++ b/wgpu-hal/Cargo.toml @@ -106,7 +106,7 @@ objc = "0.2.5" core-graphics-types = "0.1" [target.'cfg(all(target_arch = "wasm32", not(target_os = "emscripten")))'.dependencies] -wasm-bindgen = "0.2.84" +wasm-bindgen = "0.2.86" web-sys = { version = "0.3.61", features = ["Window", "HtmlCanvasElement", "WebGl2RenderingContext", "OffscreenCanvas"] } js-sys = "0.3.63"