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.

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

chore: upgrade ic-wasm/walrus to build memory64 #3827

Merged
merged 2 commits into from
Jul 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
38 changes: 24 additions & 14 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions e2e/assets/memory64/dfx.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"version": 1,
"canisters": {
"m64": {
"type": "custom",
"candid": "empty.did",
"wasm": "m64.wasm",
"build": "echo \"generated from (module (memory i64 0 0))\"",
"shrink": true,
"optimize": "Oz",
"gzip": true
}
}
}
1 change: 1 addition & 0 deletions e2e/assets/memory64/empty.did
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
service : {}
Binary file added e2e/assets/memory64/m64.wasm
Binary file not shown.
5 changes: 5 additions & 0 deletions e2e/tests-dfx/build.bash
Original file line number Diff line number Diff line change
Expand Up @@ -335,3 +335,8 @@ teardown() {

assert_command timeout 30s dfx build --check
}

@test "dfx build can post-process memory64 Wasm module" {
install_asset memory64
assert_command dfx build --check
}
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[toolchain]
channel = "1.75.0"
channel = "1.76.0"
components = ["rustfmt", "clippy"]
targets = ["wasm32-unknown-unknown"]
4 changes: 2 additions & 2 deletions src/dfx/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ ic-asset.workspace = true
ic-cdk.workspace = true
ic-identity-hsm = { workspace = true }
ic-utils = { workspace = true }
ic-wasm = "0.7.0"
ic-wasm = "0.8.0"
icrc-ledger-types = "0.1.5"
idl2json = "0.10.1"
indicatif = "0.16.0"
Expand Down Expand Up @@ -119,7 +119,7 @@ time = { workspace = true, features = [
tokio = { workspace = true, features = ["fs"] }
url.workspace = true
walkdir.workspace = true
walrus = "0.20.1"
walrus = "0.21.1"
which = "4.2.5"
ci_info = "0.14"

Expand Down
Loading