Skip to content

Commit 4372f93

Browse files
authored
fix(rust/catalyst-types): Fix catalyst-types wasm32-wasip2 build (#736)
1 parent e271d0b commit 4372f93

File tree

12 files changed

+17
-15
lines changed

12 files changed

+17
-15
lines changed

Earthfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
VERSION 0.8
22

3-
IMPORT github.com/input-output-hk/catalyst-ci/earthly/mdlint:v3.6.6 AS mdlint-ci
4-
IMPORT github.com/input-output-hk/catalyst-ci/earthly/cspell:v3.6.6 AS cspell-ci
5-
IMPORT github.com/input-output-hk/catalyst-ci/earthly/python:v3.6.6 AS python-ci
6-
IMPORT github.com/input-output-hk/catalyst-ci:v3.6.6 AS cat-ci
7-
IMPORT github.com/input-output-hk/catalyst-ci/earthly/debian:v3.6.6 AS debian
3+
IMPORT github.com/input-output-hk/catalyst-ci/earthly/mdlint:v3.6.9 AS mdlint-ci
4+
IMPORT github.com/input-output-hk/catalyst-ci/earthly/cspell:v3.6.9 AS cspell-ci
5+
IMPORT github.com/input-output-hk/catalyst-ci/earthly/python:v3.6.9 AS python-ci
6+
IMPORT github.com/input-output-hk/catalyst-ci:v3.6.9 AS cat-ci
7+
IMPORT github.com/input-output-hk/catalyst-ci/earthly/debian:v3.6.9 AS debian
88

99

1010
# check-markdown : markdown check using catalyst-ci.

catalyst-python/Earthfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
VERSION 0.8
22

3-
IMPORT github.com/input-output-hk/catalyst-ci/earthly/python:v3.6.6 AS python-ci
3+
IMPORT github.com/input-output-hk/catalyst-ci/earthly/python:v3.6.9 AS python-ci
44

55
builder:
66
FROM python-ci+python-base

docs/Earthfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
VERSION 0.8
22

3-
IMPORT github.com/input-output-hk/catalyst-ci/earthly/docs:v3.6.6 AS docs-ci
3+
IMPORT github.com/input-output-hk/catalyst-ci/earthly/docs:v3.6.9 AS docs-ci
44

55
IMPORT .. AS repo
66

docs/src/architecture/08_concepts/signed_doc/cddl/Earthfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
VERSION 0.8
22

3-
IMPORT github.com/input-output-hk/catalyst-ci/earthly/cddl:v3.6.6 AS cddl-ci
3+
IMPORT github.com/input-output-hk/catalyst-ci/earthly/cddl:v3.6.9 AS cddl-ci
44

55
check-cddl:
66
FROM cddl-ci+cddl-base

rust/Earthfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
VERSION 0.8
22

3-
IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust:v3.6.6 AS rust-ci
3+
IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust:v3.6.9 AS rust-ci
44
IMPORT ../ AS repo-ci
55

66
COPY_SRC:

rust/c509-certificate/Earthfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
VERSION 0.8
22

3-
IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust::v3.6.6 AS rust-ci
3+
IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust::v3.6.9 AS rust-ci
44

55
IMPORT .. AS rust-local
66
IMPORT ../.. AS repo

rust/catalyst-types/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ tracing = "0.1.41"
3131
strum = { version = "0.27.1", features = ["derive"] }
3232
jsonschema = { version = "0.37.4", default-features = false }
3333
serde_json = { version = "1.0.134", features = ["raw_value"] }
34-
sparse-merkle-tree = "0.6.1"
34+
sparse-merkle-tree = { version = "0.6.2", git = "https://github.com/nervosnetwork/sparse-merkle-tree.git", rev = "b74ea1bd57a397df82fcf32f2639de7e5248659f", default-features = false, features = ["std", "with-blake2b-ref"] }
3535
blake3 = "1.8.2"
3636

3737
# Only include fmmap for non-wasm32 targets

rust/catalyst-types/Earthfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
VERSION 0.8
22

3-
IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust:v3.6.6 AS rust-ci
3+
IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust:v3.6.9 AS rust-ci
44

55
# wasm32-wasip2
66
WASM_BUILD:

rust/deny.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ allow-git = [
6666
"https://github.com/dariusc93/rust-ipfs",
6767
# TODO(dt-iohk): remove this when changes from forked flutter_rust_bridge are merged into the official version
6868
"https://github.com/input-output-hk/catalyst_flutter_rust_bridge",
69+
# TODO: remove this when new version `0.6.2` would be published to crates.io
70+
"https://github.com/nervosnetwork/sparse-merkle-tree.git",
6971
]
7072

7173
[licenses]

specs/Earthfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
VERSION 0.8
22

3-
IMPORT github.com/input-output-hk/catalyst-ci/earthly/python:v3.6.6 AS python-ci
3+
IMPORT github.com/input-output-hk/catalyst-ci/earthly/python:v3.6.9 AS python-ci
44

55
IMPORT ../docs AS docs
66

0 commit comments

Comments
 (0)