Skip to content

Commit

Permalink
Make sure wasm-bindgen versions are aligned
Browse files Browse the repository at this point in the history
wasm-pack does this for us automatically, let's use that instead
of wasm-bindgen-test-runner directly.
  • Loading branch information
thomaseizinger committed Feb 5, 2021
1 parent 0dcad2a commit a955ee0
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 14 deletions.
22 changes: 10 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -245,31 +245,29 @@ jobs:
uses: actions/checkout@v2

- name: Install Rust toolchain
id: toolchain
uses: actions-rs/toolchain@v1
with:
profile: minimal
override: true
target: wasm32-unknown-unknown

- name: Cache target directory
- name: Cache target, cargo and wasm-pack directories
uses: actions/cache@v2
with:
path: target
key: wasm-wallet-target-directory-${{ hashFiles('Cargo.lock') }}-v1

- name: Cache wasm-bindgen-test-runner
uses: actions/cache@v2
with:
path: ~/.cargo/bin/wasm-bindgen-test-runner
key: ubuntu-rust-${{ env.RUST_TOOLCHAIN }}-wasm-bindgen-test-runner
path: |
target
~/.cargo/bin
~/.cache/.wasm-pack
key: ubuntu-rust-${{ steps.toolchain.outputs.rustc_hash }}-wasm-wallet-cargo-and-target-directory-${{ hashFiles('Cargo.lock') }}-v1

- name: Install wasm-bindgen-test-runner
run: which wasm-bindgen-test-runner || cargo install wasm-bindgen-cli
- name: Install wasm-pack
run: which wasm-pack || curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh

- name: Waves wallet tests
run: |
cd waves/wallet
cargo test --target wasm32-unknown-unknown
wasm-pack test --firefox --headless
- name: Upload artifact on test failure
if: ${{ failure() }}
Expand Down
2 changes: 0 additions & 2 deletions waves/wallet/.cargo/config.toml

This file was deleted.

0 comments on commit a955ee0

Please sign in to comment.