From e984394e81e01a343991ef506cede904ef0a8e50 Mon Sep 17 00:00:00 2001 From: Kevaundray Wedderburn Date: Tue, 23 Jan 2024 01:04:43 +0000 Subject: [PATCH 1/3] install wasm-bindgen using binstall --- scripts/install_wasm-bindgen.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/install_wasm-bindgen.sh b/scripts/install_wasm-bindgen.sh index c6e85bac50b..f34ed4c0ad0 100755 --- a/scripts/install_wasm-bindgen.sh +++ b/scripts/install_wasm-bindgen.sh @@ -3,8 +3,12 @@ set -eu cd $(dirname "$0")/.. +# Install binstall +curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash + # Install wasm-bindgen-cli. if [ "$(wasm-bindgen --version | cut -d' ' -f2)" != "0.2.86" ]; then echo "Building wasm-bindgen..." - RUSTFLAGS="-Ctarget-feature=-crt-static" cargo install -f wasm-bindgen-cli --version 0.2.86 + cargo binstall wasm-bindgen-cli@0.2.86 --force --no-confirm fi + From 8038fc8069154f96c994c5a45f356370f480fcdb Mon Sep 17 00:00:00 2001 From: Kevaundray Wedderburn Date: Tue, 23 Jan 2024 01:10:23 +0000 Subject: [PATCH 2/3] make consistent with other wasm-bindgen install --- .github/scripts/wasm-bindgen-install.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/scripts/wasm-bindgen-install.sh b/.github/scripts/wasm-bindgen-install.sh index b8c41393ab0..09820345589 100755 --- a/.github/scripts/wasm-bindgen-install.sh +++ b/.github/scripts/wasm-bindgen-install.sh @@ -2,4 +2,5 @@ set -eu curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash -cargo-binstall wasm-bindgen-cli --version 0.2.86 -y +cargo binstall wasm-bindgen-cli@0.2.86 --force --no-confirm + From c6af624754e4fb39009aa7e3bd4a3c7931a61517 Mon Sep 17 00:00:00 2001 From: Tom French Date: Tue, 23 Jan 2024 12:53:05 +0000 Subject: [PATCH 3/3] chore: deduplicate implementations of wasm-bindgen installs --- .github/scripts/wasm-bindgen-install.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/scripts/wasm-bindgen-install.sh b/.github/scripts/wasm-bindgen-install.sh index 09820345589..a147a46cde8 100755 --- a/.github/scripts/wasm-bindgen-install.sh +++ b/.github/scripts/wasm-bindgen-install.sh @@ -1,6 +1,5 @@ #!/bin/bash set -eu -curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash -cargo binstall wasm-bindgen-cli@0.2.86 --force --no-confirm - +# TODO call this script directly +./scripts/install_wasm-bindgen.sh