Skip to content

Commit f84a061

Browse files
committed
Add additional Web Tests
Signed-off-by: Joe Richey <[email protected]>
1 parent 8e44d13 commit f84a061

File tree

1 file changed

+31
-16
lines changed

1 file changed

+31
-16
lines changed

.github/workflows/tests.yml

Lines changed: 31 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -186,31 +186,46 @@ jobs:
186186

187187
web-tests:
188188
name: Web Test
189-
runs-on: ubuntu-latest
189+
strategy:
190+
fail-fast: false
191+
matrix:
192+
include:
193+
- os: ubuntu-latest
194+
target: x86_64-unknown-linux-musl
195+
- os: windows-latest
196+
target: x86_64-pc-windows-msvc
197+
# Reenable when Safari tests start working
198+
# - os: macos-12
199+
# target: x86_64-apple-darwin
200+
runs-on: ${{ matrix.os }}
190201
steps:
191202
- uses: actions/checkout@v3
192203
- uses: dtolnay/rust-toolchain@stable
193-
with:
194-
targets: wasm32-unknown-unknown
195-
- name: Install precompiled wasm-bindgen-test-runner
204+
- run: choco install wget
205+
if: matrix.os == 'windows-latest'
206+
- name: Install precompiled wasm-pack
207+
shell: bash
196208
run: |
197-
export VERSION=$(cargo metadata --format-version=1 | jq -r '.packages[] | select ( .name == "wasm-bindgen" ) | .version')
198-
wget -O /tmp/binaries.tar.gz https://github.com/rustwasm/wasm-bindgen/releases/download/$VERSION/wasm-bindgen-$VERSION-x86_64-unknown-linux-musl.tar.gz
199-
tar -C /tmp -xzf /tmp/binaries.tar.gz --strip-components=1
200-
mv /tmp/wasm-bindgen-test-runner ~/.cargo/bin
209+
VERSION=$(wget -nv -O - https://api.github.com/repos/rustwasm/wasm-pack/releases/latest | jq -r '.tag_name')
210+
URL=https://github.com/rustwasm/wasm-pack/releases/download/${VERSION}/wasm-pack-${VERSION}-${{ matrix.target }}.tar.gz
211+
wget -O - $URL | tar -xz --strip-components=1 -C ~/.cargo/bin
212+
wasm-pack --version
201213
- uses: Swatinem/rust-cache@v2
202214
- name: Test (Node)
203-
run: cargo test --target=wasm32-unknown-unknown --features=js
215+
run: wasm-pack test --node --features=js
204216
- name: Test (Firefox)
205-
env:
206-
GECKODRIVER: /usr/bin/geckodriver
207-
run: cargo test --target=wasm32-unknown-unknown --features=js,test-in-browser
217+
run: wasm-pack test --headless --firefox --features=js,test-in-browser
208218
- name: Test (Chrome)
209-
env:
210-
CHROMEDRIVER: /usr/bin/chromedriver
211-
run: cargo test --target=wasm32-unknown-unknown --features=js,test-in-browser
219+
run: wasm-pack test --headless --chrome --features=js,test-in-browser
220+
- name: Test (Edge)
221+
if: matrix.os == 'windows-latest'
222+
run: wasm-pack test --headless --chrome --chromedriver $Env:EDGEWEBDRIVER\msedgedriver.exe --features=js,test-in-browser
223+
# Safari tests are broken: https://github.com/rustwasm/wasm-bindgen/issues/3004
224+
# - name: Test (Safari)
225+
# if: matrix.os == 'macos-12'
226+
# run: wasm-pack test --headless --safari --features=js,test-in-browser
212227
- name: Test (custom getrandom)
213-
run: cargo test --target=wasm32-unknown-unknown --features=custom
228+
run: wasm-pack test --node --features=custom
214229

215230
wasm64-tests:
216231
name: wasm64 Build/Link

0 commit comments

Comments
 (0)