From 9a2dee121f5c8982b03a015f3286aa776fa76734 Mon Sep 17 00:00:00 2001 From: Tom French Date: Wed, 11 Sep 2024 13:27:27 +0100 Subject: [PATCH 1/2] chore: single install script for cargo-binstall --- .github/scripts/cargo-binstall-install.sh | 7 ++++++- .github/scripts/command-check.sh | 4 ++++ compiler/wasm/scripts/install_wasm-pack.sh | 7 ++----- 3 files changed, 12 insertions(+), 6 deletions(-) create mode 100755 .github/scripts/command-check.sh diff --git a/.github/scripts/cargo-binstall-install.sh b/.github/scripts/cargo-binstall-install.sh index 55d90904ca3..5cbf2cda221 100755 --- a/.github/scripts/cargo-binstall-install.sh +++ b/.github/scripts/cargo-binstall-install.sh @@ -1,4 +1,9 @@ #!/usr/bin/env 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 +cd $(dirname "$0") + +CARGO_BINSTALL_CHECK=$(./command-check.sh cargo-binstall) +if [ $CARGO_BINSTALL_CHECK != "true" ]; then + curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash +fi diff --git a/.github/scripts/command-check.sh b/.github/scripts/command-check.sh new file mode 100755 index 00000000000..ebe2fa52bde --- /dev/null +++ b/.github/scripts/command-check.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +set -eu + +command -v $1 >/dev/null 2>&1 && echo "true" || { echo >&2 "$1 is not installed" && echo "false"; } diff --git a/compiler/wasm/scripts/install_wasm-pack.sh b/compiler/wasm/scripts/install_wasm-pack.sh index b0fdffe0458..03f04d532da 100755 --- a/compiler/wasm/scripts/install_wasm-pack.sh +++ b/compiler/wasm/scripts/install_wasm-pack.sh @@ -3,10 +3,7 @@ set -eu cd $(dirname "$0")/.. -# Install wasm-pack -CARGO_BINSTALL_CHECK=$(./scripts/command-check.sh cargo-binstall) -if [ $CARGO_BINSTALL_CHECK != "true" ]; then - curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash -fi +../../../.github/scripts/cargo-binstall-install.sh +# Install wasm-pack cargo-binstall wasm-pack@0.12.1 -y --force From 125c8134c876dad9795816b984213f5ca9285a05 Mon Sep 17 00:00:00 2001 From: Tom French Date: Wed, 11 Sep 2024 13:31:17 +0100 Subject: [PATCH 2/2] . --- compiler/wasm/scripts/install_wasm-pack.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/wasm/scripts/install_wasm-pack.sh b/compiler/wasm/scripts/install_wasm-pack.sh index 03f04d532da..8936dd86fb7 100755 --- a/compiler/wasm/scripts/install_wasm-pack.sh +++ b/compiler/wasm/scripts/install_wasm-pack.sh @@ -3,7 +3,7 @@ set -eu cd $(dirname "$0")/.. -../../../.github/scripts/cargo-binstall-install.sh +../../.github/scripts/cargo-binstall-install.sh # Install wasm-pack cargo-binstall wasm-pack@0.12.1 -y --force