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

Jump to bottom

Update ic-wasm #2599

Merged
merged 1 commit into from
Sep 10, 2024
Merged

Update ic-wasm #2599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 .github/actions/bootstrap/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ runs:
path: |
~/.cargo/bin/ic-wasm
~/.rustup
key: cargo-bin-${{ steps.platform.outputs.platform-id }}-${{ hashFiles('**/Cargo.lock', 'rust-toolchain.toml') }}-4
key: cargo-bin-${{ steps.platform.outputs.platform-id }}-${{ hashFiles('**/Cargo.lock', 'rust-toolchain.toml', 'scripts/bootstrap') }}-4

- name: Bootstrap
shell: bash
Expand Down
8 changes: 4 additions & 4 deletions scripts/bootstrap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ echo "using rust version '$rust_version'"
# here we set the toolchain to 'none' and rustup will pick up on ./rust-toolchain.toml
run curl --fail https://sh.rustup.rs -sSf | run sh -s -- -y --default-toolchain "none" --no-modify-path

echo "looking for ic-wasm 0.3.5"
if [[ ! "$(command -v ic-wasm)" || "$(ic-wasm --version)" != "ic-wasm 0.3.5" ]]
echo "looking for ic-wasm 0.8.5"
if [[ ! "$(command -v ic-wasm)" || "$(ic-wasm --version)" != "ic-wasm 0.8.5" ]]
then
echo "installing ic-wasm 0.3.5"
run cargo install ic-wasm --version 0.3.5
echo "installing ic-wasm 0.8.5"
run cargo install ic-wasm --version 0.8.5
fi

# make sure the packages are actually installed (rustup waits for the first invoke to lazyload)
Expand Down
8 changes: 4 additions & 4 deletions scripts/build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,11 @@ if [ ${#CANISTERS[@]} -eq 0 ]; then
fi

# Checking for dependencies
if [[ ! "$(command -v ic-wasm)" || "$(ic-wasm --version)" != "ic-wasm 0.3.5" ]]
if [[ ! "$(command -v ic-wasm)" || "$(ic-wasm --version)" != "ic-wasm 0.8.5" ]]
then
echo "could not find ic-wasm 0.3.5"
echo "ic-wasm version 0.3.5 is needed, please run the following command:"
echo " cargo install ic-wasm --version 0.3.5"
echo "could not find ic-wasm 0.8.5"
echo "ic-wasm version 0.8.5 is needed, please run the following command:"
echo " cargo install ic-wasm --version 0.8.5"
exit 1
fi

Expand Down