Skip to content

Commit

Permalink
Merge #1534
Browse files Browse the repository at this point in the history
1534: web: Restore WebGPU CI r=kvark a=grovesNL

**Connections**
Depends on/currently includes #1533

**Description**
Even though the WebGL backend needs to be temporarily disabled, we should be able to continue checking WebGPU on wasm.

**Testing**
Manually ran the CI command `cargo check --package wgpu --examples --target=wasm32-unknown-unknown` locally which seems to catch the mistake in #1533 without building wgpu-core/wgpu-hal.

Co-authored-by: grovesNL <josh@joshgroves.com>
  • Loading branch information
bors[bot] and grovesNL authored Jun 21, 2021
2 parents 88b11e2 + ee25429 commit 56d584a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ jobs:
run: cargo check --manifest-path wgpu-core/Cargo.toml --features trace --target ${{ env.TARGET }}

wasm:
if: false # disable until hal/Gles backend is setup
name: Web Assembly
runs-on: ubuntu-latest
env:
Expand All @@ -44,9 +43,10 @@ jobs:
- uses: actions/checkout@v2
- run: rustup target add wasm32-unknown-unknown
- name: Check WebGPU
run: cargo check --all-targets --target=wasm32-unknown-unknown
- name: Check WebGL
run: cargo check --all-targets --target=wasm32-unknown-unknown --features webgl
run: cargo check --package wgpu --examples --target=wasm32-unknown-unknown
# disable until hal/Gles backend is setup
# - name: Check WebGL
# run: cargo check --all-targets --target=wasm32-unknown-unknown --features webgl

build:
name: ${{ matrix.name }}
Expand Down
2 changes: 1 addition & 1 deletion bors.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ status = [
"Ubuntu Nightly",
"Windows Stable",
"Windows Nightly",
#"Web Assembly",
"Web Assembly",
#"Clippy",
]

0 comments on commit 56d584a

Please sign in to comment.