Skip to content
This repository was archived by the owner on Nov 4, 2024. It is now read-only.

Commit 69c4ea2

Browse files
committed
Fix wasm-opt release paths
1 parent 922fd0a commit 69c4ea2

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

dockerfiles/contracts-ci-linux/Dockerfile

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,16 @@ RUN set -eux; \
3030
zlib1g-dev npm wabt llvm-dev && \
3131
npm install --ignore-scripts -g yarn && \
3232
# `binaryen` is needed by `cargo-contract` for optimizing Wasm files.
33-
# We fetch the latest release which contains a Linux binary. There is
34-
# currently an issue with not all releases containing a Linux binary
35-
# (https://github.com/WebAssembly/binaryen/issues/4148). Once that one
36-
# is fixed we can always use the latest release again.
33+
# We fetch the latest release which contains a Linux binary.
3734
curl --silent https://api.github.com/repos/WebAssembly/binaryen/releases | \
3835
egrep --only-matching 'https://github.com/WebAssembly/binaryen/releases/download/version_[0-9]+/binaryen-version_[0-9]+-x86_64-linux.tar.gz' | \
3936
head -n1 | \
4037
xargs curl -L -O && \
41-
tar -xvzf binaryen-version_*-x86_64-linux.tar.gz && \
42-
rm binaryen-version_*-x86_64-linux.tar.gz && \
43-
chmod +x binaryen-version_*/bin/wasm-opt && \
44-
mv binaryen-version_*/bin/wasm-opt /usr/local/bin/ && \
45-
rm -rf binaryen-version_*/ && \
38+
tar -xvzf binaryen-*-x86_64-linux.tar.gz && \
39+
rm binaryen-*-x86_64-linux.tar.gz && \
40+
chmod +x binaryen-*/bin/wasm-opt && \
41+
mv binaryen-*/bin/wasm-opt /usr/local/bin/ && \
42+
rm -rf binaryen-*/ && \
4643
# Installs the latest common nightly for the listed components,
4744
# adds those components, wasm target and sets the profile to minimal
4845
rustup toolchain install nightly --target wasm32-unknown-unknown \

dockerfiles/ink-ci-linux/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ RUN set -eux; \
4646
head -n1 | \
4747
xargs curl -L -O && \
4848
tar -xvzf binaryen-*-x86_64-linux.tar.gz && \
49-
rm binaryen-version_*-x86_64-linux.tar.gz && \
49+
rm binaryen-*-x86_64-linux.tar.gz && \
5050
chmod +x binaryen-*/bin/wasm-opt && \
5151
mv binaryen-*/bin/wasm-opt /usr/local/bin/ && \
5252
rm -rf binaryen-*/ && \

0 commit comments

Comments
 (0)