File tree Expand file tree Collapse file tree 3 files changed +20
-17
lines changed
Expand file tree Collapse file tree 3 files changed +20
-17
lines changed Original file line number Diff line number Diff line change @@ -29,21 +29,29 @@ jobs:
2929 DO_BENCH : true
3030 run : ./contrib/test.sh
3131
32- wasm_pack :
32+ wasm :
3333 name : Stable - Docs / WebAssembly Build
34- runs-on : ubuntu-latest
3534 strategy :
3635 matrix :
37- rust :
38- - stable
36+ target : [ x86_64-unknown-linux-gnu, x86_64-apple-darwin ]
37+ include :
38+ - target : x86_64-unknown-linux-gnu
39+ os : ubuntu-latest
40+ cc : clang-12
41+ ar : ar
42+ - target : x86_64-apple-darwin
43+ os : macos-latest
44+ cc : /usr/local/opt/llvm/bin/clang
45+ ar : /usr/local/opt/llvm/bin/llvm-ar
46+ runs-on : ${{ matrix.os }}
3947 steps :
4048 - name : Checkout Crate
4149 uses : actions/checkout@v2
4250 - name : Checkout Toolchain
4351 uses : actions-rs/toolchain@v1
4452 with :
4553 profile : minimal
46- toolchain : ${{ matrix.rust }}
54+ toolchain : stable
4755 override : true
4856 - name : Building docs
4957 env :
@@ -54,18 +62,10 @@ jobs:
5462 - name : Running WASM build
5563 env :
5664 DO_WASM : true
65+ CC : ${{ matrix.cc }}
66+ AR : ${{ matrix.ar }}
5767 run : ./contrib/test.sh
5868
59- build_wasm :
60- runs-on : ubuntu-latest
61- steps :
62- - uses : actions/checkout@v2
63- - uses : actions-rs/toolchain@v1
64- with :
65- toolchain : stable
66- target : wasm32-unknown-unknown
67- - run : cargo build --target wasm32-unknown-unknown --features global-context,use-serde,use-rand
68-
6969 Tests :
7070 name : Tests
7171 strategy :
Original file line number Diff line number Diff line change @@ -45,3 +45,6 @@ bitcoin_hashes = "0.9"
4545[target .wasm32-unknown-unknown .dev-dependencies ]
4646wasm-bindgen-test = " 0.3"
4747rand = { version = " 0.6" , features = [" wasm-bindgen" ] }
48+
49+ [lib ]
50+ crate-type = [" cdylib" , " rlib" ]
Original file line number Diff line number Diff line change 5353# Webassembly stuff
5454if [ " $DO_WASM " = true ]; then
5555 clang --version &&
56- CC=clang-9 wasm-pack build &&
57- CC=clang-9 wasm-pack test --node;
56+ wasm-pack build &&
57+ wasm-pack test --node;
5858fi
5959
6060# Address Sanitizer
You can’t perform that action at this time.
0 commit comments