Skip to content

Commit

Permalink
try to figure out why wasm tests aren't being found
Browse files Browse the repository at this point in the history
  • Loading branch information
quodlibetor committed Jun 26, 2020
1 parent eed0eb3 commit d5d0cf1
Show file tree
Hide file tree
Showing 3 changed files with 57 additions and 56 deletions.
111 changes: 56 additions & 55 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,61 +7,61 @@ on:
branches: [master]

jobs:
test:
strategy:
matrix:
os: [ubuntu-16.04, ubuntu-latest, macos-latest, windows-latest]
rust_version: [stable]
include:
# check all tzs on most-recent OS's
- os: ubuntu-latest
rust_version: stable
exhaustive_tz: all_tzs
- os: windows-latest
rust_version: stable
exhaustive_tz: all_tzs
- os: macos-latest
rust_version: stable
exhaustive_tz: all_tzs
# test other rust versions
- os: ubuntu-latest
rust_version: beta
- os: ubuntu-latest
rust_version: nightly
- os: ubuntu-16.04
rust_version: 1.13.0
- os: macos-latest
rust_version: 1.13.0
# time doesn't work on windows with 1.13

runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v2

- name: Install rust
uses: actions-rs/toolchain@v1
with:
toolchain: ${{ matrix.rust_version }}
override: true

- name: Build and Test
run: bash ci/github.sh
env:
RUST_VERSION: ${{ matrix.rust_version }}
EXHAUSTIVE_TZ: ${{ matrix.exhaustive_tz }}

lint:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Lint
run: bash ci/lint.sh
- name: Run ShellCheck
uses: quodlibetor/action-shellcheck@master
with:
check_together: 'y'
# test:
# strategy:
# matrix:
# os: [ubuntu-16.04, ubuntu-latest, macos-latest, windows-latest]
# rust_version: [stable]
# include:
# # check all tzs on most-recent OS's
# - os: ubuntu-latest
# rust_version: stable
# exhaustive_tz: all_tzs
# - os: windows-latest
# rust_version: stable
# exhaustive_tz: all_tzs
# - os: macos-latest
# rust_version: stable
# exhaustive_tz: all_tzs
# # test other rust versions
# - os: ubuntu-latest
# rust_version: beta
# - os: ubuntu-latest
# rust_version: nightly
# - os: ubuntu-16.04
# rust_version: 1.13.0
# - os: macos-latest
# rust_version: 1.13.0
# # time doesn't work on windows with 1.13

# runs-on: ${{ matrix.os }}

# steps:
# - uses: actions/checkout@v2

# - name: Install rust
# uses: actions-rs/toolchain@v1
# with:
# toolchain: ${{ matrix.rust_version }}
# override: true

# - name: Build and Test
# run: bash ci/github.sh
# env:
# RUST_VERSION: ${{ matrix.rust_version }}
# EXHAUSTIVE_TZ: ${{ matrix.exhaustive_tz }}

# lint:
# runs-on: ubuntu-latest

# steps:
# - uses: actions/checkout@v2
# - name: Lint
# run: bash ci/lint.sh
# - name: Run ShellCheck
# uses: quodlibetor/action-shellcheck@master
# with:
# check_together: 'y'

no_std:
strategy:
Expand Down Expand Up @@ -90,6 +90,7 @@ jobs:
strategy:
matrix:
os: [macos-latest, ubuntu-latest]

runs-on: ${{ matrix.os }}

steps:
Expand Down
1 change: 1 addition & 0 deletions ci/github.sh
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ test_wasm() {
runv wasm-pack --version
fi
now=$(date +%s)
wasm-pack build
for tz in "${TEST_TZS[@]}"; do
runt env TZ="$tz" NOW="$now" wasm-pack test --node -- --features wasmbind
done
Expand Down
1 change: 0 additions & 1 deletion tests/wasm.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#[cfg(all(target_arch = "wasm32", not(target_os = "wasi"), feature = "wasmbind"))]
mod test {
extern crate chrono;
extern crate wasm_bindgen_test;
Expand Down

0 comments on commit d5d0cf1

Please sign in to comment.