Skip to content

Commit 1046396

Browse files
committed
Make binaryen optional and don't install it in CI
1 parent 6457223 commit 1046396

File tree

2 files changed

+12
-18
lines changed

2 files changed

+12
-18
lines changed

.travis.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,6 @@ cache: cargo
44
rust:
55
- nightly
66

7-
# For `binaryen`.
8-
addons:
9-
apt:
10-
sources:
11-
- 'ubuntu-toolchain-r-test'
12-
packages:
13-
- 'cmake'
14-
- 'g++-5'
15-
167
env:
178
matrix:
189
- SCRIPT="./check.sh"
@@ -23,9 +14,6 @@ before_script:
2314
- rustup target add wasm32-unknown-unknown
2415
- which wasm-gc || cargo install --git https://github.com/alexcrichton/wasm-gc
2516
- which cargo-readme || cargo install cargo-readme
26-
- test -d binaryen || git clone https://github.com/WebAssembly/binaryen.git
27-
- export PATH="$PATH:$(pwd)/binaryen/bin"
28-
- which wasm-opt || (cd binaryen && git pull origin master && cmake . && make -j4 && cd -)
2917

3018
script:
3119
- "$SCRIPT"

build.sh

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,23 @@ cargo build --release --target wasm32-unknown-unknown
2222

2323
wasm-gc ../target/wasm32-unknown-unknown/release/wee_alloc_example.wasm \
2424
../target/wasm32-unknown-unknown/release/wee_alloc_example.gc.wasm
25-
wasm-opt -Oz \
26-
../target/wasm32-unknown-unknown/release/wee_alloc_example.gc.wasm \
27-
-o ../target/wasm32-unknown-unknown/release/wee_alloc_example.gc.opt.wasm
25+
26+
if which wasm-opt; then
27+
wasm-opt -Oz \
28+
../target/wasm32-unknown-unknown/release/wee_alloc_example.gc.wasm \
29+
-o ../target/wasm32-unknown-unknown/release/wee_alloc_example.gc.opt.wasm
30+
fi
2831

2932
cargo build --release --features size_classes --target wasm32-unknown-unknown
3033

3134
wasm-gc ../target/wasm32-unknown-unknown/release/wee_alloc_example.wasm \
3235
../target/wasm32-unknown-unknown/release/wee_alloc_example.size_classes.gc.wasm
33-
wasm-opt -Oz \
34-
../target/wasm32-unknown-unknown/release/wee_alloc_example.size_classes.gc.wasm \
35-
-o ../target/wasm32-unknown-unknown/release/wee_alloc_example.size_classes.gc.opt.wasm
36+
37+
if which wasm-opt; then
38+
wasm-opt -Oz \
39+
../target/wasm32-unknown-unknown/release/wee_alloc_example.size_classes.gc.wasm \
40+
-o ../target/wasm32-unknown-unknown/release/wee_alloc_example.size_classes.gc.opt.wasm
41+
fi
3642

3743
wc -c ../target/wasm32-unknown-unknown/release/*.gc.opt.wasm
3844

0 commit comments

Comments
 (0)