From a96a0b0512e6901e30fb8ae0e3ceb774735579e1 Mon Sep 17 00:00:00 2001 From: Denys Zadorozhnyi Date: Wed, 20 Sep 2023 12:18:00 +0300 Subject: [PATCH 1/2] update wasm-bindgen to 0.2.87 --- Cargo.toml | 2 +- bindings/ergo-lib-wasm/Cargo.toml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 2a3d33e3c..3508e93b2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -72,7 +72,7 @@ itertools = "0.10.3" proptest = { version = "=1.0", default-features = false, features = ["std"] } proptest-derive = "0.3" pretty_assertions = "1.3" -wasm-bindgen-test = "0.3.10" +wasm-bindgen-test = "0.3.37" expect-test = "1.0.1" [profile.release] diff --git a/bindings/ergo-lib-wasm/Cargo.toml b/bindings/ergo-lib-wasm/Cargo.toml index 8cd58f0d7..f0c61b0db 100644 --- a/bindings/ergo-lib-wasm/Cargo.toml +++ b/bindings/ergo-lib-wasm/Cargo.toml @@ -17,7 +17,7 @@ compiler = ["ergo-lib/compiler"] [dependencies] base16 = { workspace = true } -serde = { workspace = true } +serde = { workspace = true } ergo-lib = { workspace = true } sigma-util = { workspace = true } serde_json = { workspace = true } @@ -42,8 +42,8 @@ derive_more = { workspace = true } num-traits = { workspace = true } serde_with = { workspace = true } bounded-vec = { workspace = true, features=["serde"] } -wasm-bindgen = { version = "0.2.84", features = [] } -wasm-bindgen-futures = { version = "0.4.34" } +wasm-bindgen = { version = "0.2.87", features = [] } +wasm-bindgen-futures = { version = "0.4.37" } [dev-dependencies] wasm-bindgen-test = { workspace = true } From de6310d793ea2988a2406f9c55ec5d7c6ceda55a Mon Sep 17 00:00:00 2001 From: Denys Zadorozhnyi Date: Wed, 20 Sep 2023 12:35:09 +0300 Subject: [PATCH 2/2] fix tarpaulin command on CI; --- .github/workflows/ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 994337c50..21ba5c996 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -70,7 +70,7 @@ jobs: uses: actions/checkout@v2 - name: Generate code coverage run: | - cargo tarpaulin --avoid-cfg-tarpaulin --timeout=360 -v --out Lcov --exclude-files 'bindings/**/*.*' --exclude-files 'ergo-rest/src/reqwest.rs' --exclude-files 'ergo-rest/src/reqwest/**/*.*' --exclude-files 'ergo-rest/src/wasm_timer.rs' --exclude-files 'ergo-rest/src/wasm_timer/**/*.*' + cargo tarpaulin --avoid-cfg-tarpaulin --timeout=360 --out lcov --exclude-files 'bindings/**/*.*' --exclude-files 'ergo-rest/src/reqwest.rs' --exclude-files 'ergo-rest/src/reqwest/**/*.*' --exclude-files 'ergo-rest/src/wasm_timer.rs' --exclude-files 'ergo-rest/src/wasm_timer/**/*.*' - name: Push code coverage results to coveralls.io uses: coverallsapp/github-action@master with: @@ -107,7 +107,7 @@ jobs: ports: # Maps tcp port 9053 on service container to the host - 9053:9053 - + steps: # Need the following command to get around a GA bug where the workspace can't be cleared due # to incorrect access permissions. This comes up due to the use of the service container @@ -126,9 +126,9 @@ jobs: run: | cd bindings/ergo-lib-wasm curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh -s -- -f - curl -fsSL https://deb.nodesource.com/setup_lts.x | sudo -E bash - + curl -fsSL https://deb.nodesource.com/setup_lts.x | sudo -E bash - sudo apt-get -y install nodejs - + - name: run Wasm tests run: | cd bindings/ergo-lib-wasm @@ -144,7 +144,7 @@ jobs: wasm-pack build npm install npm run test - + - name: run browser JS tests run: | cd bindings/ergo-lib-wasm