Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use cargo version of wasm-opt instead of npx | /workflows/cd-containers #1773

Merged
merged 2 commits into from
Jun 15, 2023
+8 −11
Merged

Use cargo version of wasm-opt instead of npx | /workflows/cd-containers #1773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a9aa0cc
using cargo version of wasm opt instead of npx
nerfZael May 29, 2023
3ee78c0
chore: update all rust build scripts to use cargo-based wasm-opt
dOrgJelli Jun 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/cli/src/lib/build-strategies/strategies/DockerVMStrategy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const CONFIGS: Record<BuildableLanguage, VMConfig> = {
"wasm/rust": {
defaultIncludes: ["Cargo.toml", "Cargo.lock"],
baseImage: "polywrap/vm-base-rs",
version: "0.2.0",
version: "0.2.1",
},
"wasm/assemblyscript": {
defaultIncludes: ["package.json", "package-lock.json", "yarn.lock"],
Expand Down
5 changes: 1 addition & 4 deletions packages/cli/src/lib/defaults/build-strategies/wasm/rust/image/Dockerfile.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@ RUN apk add curl pkgconfig openssl-dev bash
RUN apk add clang llvm build-base

# Install wasm-opt
RUN curl -L https://github.com/WebAssembly/binaryen/releases/download/version_101/binaryen-version_101-x86_64-linux.tar.gz | tar -xz \
&& chmod +x binaryen-version_101/bin/wasm-opt \
&& cp binaryen-version_101/bin/wasm-opt /usr/local/bin/ \
&& rm -rf binary-version_101
RUN cargo install wasm-opt

# Install the toml-cli
RUN cargo install toml-cli
Expand Down
5 changes: 4 additions & 1 deletion packages/cli/src/lib/defaults/build-strategies/wasm/rust/local/local.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ cargo install wasm-bindgen-cli
# Install wasm-tools
cargo install wasm-tools

# Install wasm-opt
cargo install wasm-opt

# Ensure the module at {{dir}} has the crate-type = ["cdylib"]
toml set "$1"/Cargo.toml lib.crate-type ["cdylib"] > "$1"/Cargo-local.toml && \
mv "$1"/Cargo.toml "$1"/Cargo-bak.toml && \
Expand Down Expand Up @@ -56,5 +59,5 @@ rm -rf "$2"/strip_module.wasm

# Use wasm-opt to perform the "asyncify" post-processing step over all modules
export ASYNCIFY_STACK_SIZE=24576
npx wasm-opt --asyncify -Os "$2"/snipped_module.wasm -o "$2"/wrap.wasm
wasm-opt --asyncify -Os "$2"/snipped_module.wasm -o "$2"/wrap.wasm
rm -rf "$2"/snipped_module.wasm
5 changes: 1 addition & 4 deletions packages/cli/src/lib/defaults/build-strategies/wasm/rust/vm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@ RUN apk add curl pkgconfig openssl-dev bash
RUN apk add clang llvm build-base

# Install wasm-opt
RUN curl -L https://github.com/WebAssembly/binaryen/releases/download/version_101/binaryen-version_101-x86_64-linux.tar.gz | tar -xz \
&& chmod +x binaryen-version_101/bin/wasm-opt \
&& cp binaryen-version_101/bin/wasm-opt /usr/local/bin/ \
&& rm -rf binary-version_101
RUN cargo install wasm-opt

# Install the toml-cli
RUN cargo install toml-cli
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/lib/defaults/build-strategies/wasm/rust/vm/VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.2.0
0.2.1