Skip to content

Commit

Permalink
Remove hacks for git wasm-bindgen
Browse files Browse the repository at this point in the history
  • Loading branch information
alexcrichton authored and gnzlbg committed Aug 15, 2018
1 parent da98073 commit 131eccd
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 18 deletions.
4 changes: 0 additions & 4 deletions Cargo.toml
Expand Up @@ -14,7 +14,3 @@ opt-level = 3
[profile.bench]
debug = 1
opt-level = 3

[patch.crates-io]
wasm-bindgen = { git = 'https://github.com/rustwasm/wasm-bindgen' }
wasm-bindgen-test = { git = 'https://github.com/rustwasm/wasm-bindgen' }
14 changes: 3 additions & 11 deletions ci/docker/wasm32-unknown-unknown/Dockerfile
Expand Up @@ -17,17 +17,9 @@ RUN make -C wabt -j$(nproc)
ENV PATH=$PATH:/wabt/bin

# Install `wasm-bindgen-test-runner`
# RUN curl -L https://github.com/rustwasm/wasm-bindgen/releases/download/0.2.15/wasm-bindgen-0.2.15-x86_64-unknown-linux-musl.tar.gz \
# | tar xzf -
# ENV PATH=$PATH:/wasm-bindgen-0.2.15-x86_64-unknown-linux-musl
# TODO: remove these lines once we can use published releases
ENV CARGO_HOME=/cargo RUSTUP_HOME=/rustup
ENV PATH=$PATH:/cargo/bin
RUN curl https://sh.rustup.rs | sh -s -- -y
ENV LIBZ_SYS_STATIC=1
RUN cargo install --git https://github.com/rustwasm/wasm-bindgen \
wasm-bindgen-cli --features vendored-openssl

RUN curl -L https://github.com/rustwasm/wasm-bindgen/releases/download/0.2.16/wasm-bindgen-0.2.16-x86_64-unknown-linux-musl.tar.gz \
| tar xzf -
ENV PATH=$PATH:/wasm-bindgen-0.2.16-x86_64-unknown-linux-musl
ENV CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_RUNNER=wasm-bindgen-test-runner

# Install `node`
Expand Down
2 changes: 1 addition & 1 deletion crates/coresimd/Cargo.toml
Expand Up @@ -23,7 +23,7 @@ stdsimd-test = { version = "0.*", path = "../stdsimd-test" }
stdsimd = { version = "0.0.3", path = "../stdsimd" }

[target.wasm32-unknown-unknown.dev-dependencies]
wasm-bindgen-test = "=0.2.15"
wasm-bindgen-test = "0.2.16"

[features]
# Internal-usage only: denies all warnings.
Expand Down
3 changes: 1 addition & 2 deletions crates/stdsimd-test/Cargo.toml
Expand Up @@ -10,8 +10,7 @@ backtrace = "0.3"
cc = "1.0"
lazy_static = "1.0"
rustc-demangle = "0.1.8"
wasm-bindgen = "0.2.15"
wasm-bindgen = "0.2.16"

[features]
default = []
git_wasm_bindgen = []

0 comments on commit 131eccd

Please sign in to comment.