From c67bc399a18948c344e2178d961aec558106782d Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Thu, 29 Aug 2024 14:18:47 -0700 Subject: [PATCH 01/62] log --- crates/host/src/module/mod.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/crates/host/src/module/mod.rs b/crates/host/src/module/mod.rs index ee83528c..e6883432 100644 --- a/crates/host/src/module/mod.rs +++ b/crates/host/src/module/mod.rs @@ -225,6 +225,7 @@ impl SerializedModuleCache { }); let (module, serialized_module) = match module_load { Some(Ok(serialized_module)) => { + tracing::info!("get_with_build_cache serialized_module={:?}", serialized_module); let deserialized_module = unsafe { Module::deserialize(&self.runtime_engine, serialized_module.clone()) } .map_err(|e| wasm_error!(WasmErrorInner::Compile(e.to_string())))?; From 368a8e20acb547c5bc2d491a8cba31a4070a5c92 Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 30 Aug 2024 09:45:07 -0700 Subject: [PATCH 02/62] ci: windows tests run both wasmer_wamr & wasmer_sys feature flags as well, move into common workflow file --- .github/workflows/test.yml | 18 ++++++++++++++++++ .github/workflows/windows.yml | 19 ------------------- 2 files changed, 18 insertions(+), 19 deletions(-) delete mode 100644 .github/workflows/windows.yml diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index fa6762b1..e4870a10 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -25,3 +25,21 @@ jobs: name: holochain-ci authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}" - run: nix develop --command ${{ matrix.script }} + + test-windows: + runs-on: windows-latest + matrix: + wasmer-feature: + - wasmer_sys + - wasmer_wamr + steps: + - uses: actions/checkout@v4 + - uses: dtolnay/rust-toolchain@stable + with: + targets: wasm32-unknown-unknown + - name: test root + run: cargo test --release --no-default-features --features ${{ matrix.wasmer-feature }} -- --nocapture + - name: test + run: cargo test --release --manifest-path test/Cargo.toml --no-default-features --features ${{ matrix.wasmer-feature }} -- --nocapture + - name: bench + run: cd test && cargo bench --no-default-features --features ${{ matrix.wasmer-feature }} \ No newline at end of file diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml deleted file mode 100644 index b0e8fe72..00000000 --- a/.github/workflows/windows.yml +++ /dev/null @@ -1,19 +0,0 @@ -name: run tests windows - -on: - push: - branches: - - develop - pull_request: {} - -jobs: - test: - runs-on: windows-latest - steps: - - uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@stable - with: - targets: wasm32-unknown-unknown - - run: cargo test -- --nocapture - - run: cargo test --manifest-path test/Cargo.toml -- --nocapture - - run: cd test && cargo bench From 2eb5669efba0b05e2250d625ee979268e08acc17 Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 30 Aug 2024 10:51:13 -0700 Subject: [PATCH 03/62] chore: delete unused circle ci workflow --- .circleci/config.yml | 33 --------------------------------- 1 file changed, 33 deletions(-) delete mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index dfe9f697..00000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,33 +0,0 @@ -version: 2.1 - -jobs: - build: - docker: - - image: holochain/holonix:latest.develop - steps: - - checkout - - run: nix-shell --fallback --run ./test.sh - - deploy-crates: - docker: - - image: holochain/holonix:latest - steps: - - checkout - - run: - no_output_timeout: 20m - command: nix-shell --fallback --run "hn-release-hook-publish-crates-io 'common host guest'" - -workflows: - version: 2.1 - tests: - jobs: - - build - - deploy: - jobs: - - deploy-crates: - filters: - branches: - ignore: /.*/ - tags: - only: /^v[0-9]+\.[0-9]+\.[0-9]+$/ From 202eb306a34ba095b9d77d6e770d61772753762d Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 30 Aug 2024 10:51:47 -0700 Subject: [PATCH 04/62] fix: bench with wasmer_wamr feature --- test/benches/bench.rs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/benches/bench.rs b/test/benches/bench.rs index 72338627..bd096706 100644 --- a/test/benches/bench.rs +++ b/test/benches/bench.rs @@ -1,3 +1,7 @@ +// Temporarily include a fork of wasmer from the git branch 'wamr', until it is officially released in wasmer v5 +#[cfg(feature = "wasmer_wamr")] +extern crate hc_wasmer as wasmer; + use criterion::BenchmarkId; use criterion::Throughput; use criterion::{criterion_group, criterion_main, Criterion}; From ef93147ba25d346c43149b9fa7bcc82a12e5baa4 Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 30 Aug 2024 10:52:27 -0700 Subject: [PATCH 05/62] refactor: split up testing scripts by wasmer feature --- README.md | 2 +- bench.sh => scripts/bench-wasmer_sys.sh | 2 +- scripts/bench-wasmer_wamr.sh | 10 ++++++++++ scripts/bench.sh | 4 ++++ fuzz.sh => scripts/fuzz-wasmer_sys.sh | 2 +- scripts/fuzz-wasmer_wamr.sh | 5 +++++ scripts/fuzz.sh | 4 ++++ test.sh => scripts/test-wasmer_sys.sh | 9 ++------- scripts/test-wasmer_wamr.sh | 11 +++++++++++ scripts/test.sh | 4 ++++ 10 files changed, 43 insertions(+), 10 deletions(-) rename bench.sh => scripts/bench-wasmer_sys.sh (74%) create mode 100755 scripts/bench-wasmer_wamr.sh create mode 100644 scripts/bench.sh rename fuzz.sh => scripts/fuzz-wasmer_sys.sh (50%) create mode 100755 scripts/fuzz-wasmer_wamr.sh create mode 100644 scripts/fuzz.sh rename test.sh => scripts/test-wasmer_sys.sh (62%) create mode 100755 scripts/test-wasmer_wamr.sh create mode 100644 scripts/test.sh diff --git a/README.md b/README.md index 5841b28c..e7caa3b3 100644 --- a/README.md +++ b/README.md @@ -103,7 +103,7 @@ very reasonable overhead for the host to build a completely fresh instance. Calling a function with `holochain_wasmer_host::guest::call()` takes several `us` for small input/output values and some `ms` for ~1mb of input/output data. -To see benchmarks on your system run `nix-shell --run ./bench.sh`. +To see benchmarks on your system run `nix-shell --run ./scripts/bench.sh`. With low overhead like this, core is relatively free to decide when it wants to re-instantiate an already-in-memory module. diff --git a/bench.sh b/scripts/bench-wasmer_sys.sh similarity index 74% rename from bench.sh rename to scripts/bench-wasmer_sys.sh index 7e00b729..63909ae5 100755 --- a/bench.sh +++ b/scripts/bench-wasmer_sys.sh @@ -1,7 +1,7 @@ #! /usr/bin/env bash ( cd test && \ - cargo bench + cargo bench --no-default-features --features wasmer_sys ) # it's possible to flamegraph the benchmarks like this: diff --git a/scripts/bench-wasmer_wamr.sh b/scripts/bench-wasmer_wamr.sh new file mode 100755 index 00000000..0fe9b6a8 --- /dev/null +++ b/scripts/bench-wasmer_wamr.sh @@ -0,0 +1,10 @@ +#! /usr/bin/env bash +( + cd test && \ + cargo bench --no-default-features --features wasmer_wamr +) + +# it's possible to flamegraph the benchmarks like this: +# +# cd test +# flamegraph cargo bench --bench bench -- --profile-time 10 diff --git a/scripts/bench.sh b/scripts/bench.sh new file mode 100644 index 00000000..ec8a8bb4 --- /dev/null +++ b/scripts/bench.sh @@ -0,0 +1,4 @@ +#! /usr/bin/env bash + +./bench-wasmer_sys.sh && \ +./bench-wasmer_wamr.sh \ No newline at end of file diff --git a/fuzz.sh b/scripts/fuzz-wasmer_sys.sh similarity index 50% rename from fuzz.sh rename to scripts/fuzz-wasmer_sys.sh index b094610c..80472e81 100755 --- a/fuzz.sh +++ b/scripts/fuzz-wasmer_sys.sh @@ -2,4 +2,4 @@ cargo test cargo test --manifest-path test/Cargo.toml -cargo test-fuzz "$FUZZ_TARGET" \ No newline at end of file +cargo test-fuzz "$FUZZ_TARGET" --no-default-features --features wasmer_sys \ No newline at end of file diff --git a/scripts/fuzz-wasmer_wamr.sh b/scripts/fuzz-wasmer_wamr.sh new file mode 100755 index 00000000..88c39567 --- /dev/null +++ b/scripts/fuzz-wasmer_wamr.sh @@ -0,0 +1,5 @@ +#! /usr/bin/env bash +cargo test +cargo test --manifest-path test/Cargo.toml + +cargo test-fuzz "$FUZZ_TARGET" --no-default-features --features wasmer_wamr \ No newline at end of file diff --git a/scripts/fuzz.sh b/scripts/fuzz.sh new file mode 100644 index 00000000..c2b47543 --- /dev/null +++ b/scripts/fuzz.sh @@ -0,0 +1,4 @@ +#! /usr/bin/env bash + +./fuzz-wasmer_sys.sh && \ +./fuzz-wasmer_wamr.sh \ No newline at end of file diff --git a/test.sh b/scripts/test-wasmer_sys.sh similarity index 62% rename from test.sh rename to scripts/test-wasmer_sys.sh index 0a7ce3fa..ecab6a3f 100755 --- a/test.sh +++ b/scripts/test-wasmer_sys.sh @@ -10,17 +10,12 @@ cargo fmt cargo clippy ( cd test && cargo clippy ) ( cd crates/guest && cargo clippy --target wasm32-unknown-unknown ) -cargo clippy --no-default-features --features wasmer_wamr -( cd test && cargo clippy --no-default-features --features wasmer_wamr ) # tests the root workspace that doesn't include any wasm code -cargo test ${1-} -- --nocapture +cargo test --no-default-features --features wasmer_sys ${1-} -- --nocapture # test that everything builds cargo build --release --manifest-path test/test_wasm/Cargo.toml --target wasm32-unknown-unknown # build wasm and run the "full" tests for wasmer_sys -cargo test --release --manifest-path test/Cargo.toml ${1-} -- --nocapture - -# build wasm and run the "full" tests for wasmer_wamr -cargo test --release --manifest-path test/Cargo.toml --no-default-features --features wasmer_wamr ${1-} -- --nocapture +cargo test --release --manifest-path test/Cargo.toml --no-default-features --features wasmer_sys ${1-} -- --nocapture diff --git a/scripts/test-wasmer_wamr.sh b/scripts/test-wasmer_wamr.sh new file mode 100755 index 00000000..a565bcee --- /dev/null +++ b/scripts/test-wasmer_wamr.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash +set -euxo pipefail + +export RUST_BACKTRACE=full +export WASMER_BACKTRACE=1 + +cargo clippy --no-default-features --features wasmer_wamr +( cd test && cargo clippy --no-default-features --features wasmer_wamr ) + +# build wasm and run the "full" tests for wasmer_wamr +cargo test --release --manifest-path test/Cargo.toml --no-default-features --features wasmer_wamr ${1-} -- --nocapture diff --git a/scripts/test.sh b/scripts/test.sh new file mode 100644 index 00000000..30908fcb --- /dev/null +++ b/scripts/test.sh @@ -0,0 +1,4 @@ +#! /usr/bin/env bash + +./test-wasmer_sys.sh && \ +./test-wasmer_wamr.sh \ No newline at end of file From 1cb1ba7ea0d89f723186ee16851b6b2fd672e74b Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 30 Aug 2024 10:53:13 -0700 Subject: [PATCH 06/62] ci: split up ci jobs by wasmer feature, test both wasmer features in windows runner --- .github/workflows/test.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e4870a10..7bfd1e34 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,8 +11,9 @@ jobs: strategy: fail-fast: false matrix: - script: ["./test.sh", "./bench.sh"] + script: ["test", "bench"] os: ["ubuntu-latest", "macos-latest"] + wasmer-feature: ["wasmer_sys", "wasmer_wamr"] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 @@ -24,14 +25,12 @@ jobs: with: name: holochain-ci authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}" - - run: nix develop --command ${{ matrix.script }} + - run: nix develop --command ./${{ matrix.script }}-${{ matrix.wasmer-feature }}.sh test-windows: runs-on: windows-latest matrix: - wasmer-feature: - - wasmer_sys - - wasmer_wamr + wasmer-feature: ["wasmer_sys", "wasmer_wamr"] steps: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable From f39f46c95858643b363ab9777e444123a3147ade Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 30 Aug 2024 10:53:38 -0700 Subject: [PATCH 07/62] doc: clarifying comment --- test/src/test.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/test/src/test.rs b/test/src/test.rs index 2461f366..f5b02324 100644 --- a/test/src/test.rs +++ b/test/src/test.rs @@ -1,6 +1,7 @@ pub mod import; pub mod wasms; +// Temporarily include a fork of wasmer from the git branch 'wamr', until it is officially released in wasmer v5 #[cfg(feature = "wasmer_wamr")] extern crate hc_wasmer as wasmer; From ac0cb24e953855e280e0857b5943781d153f2272 Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 30 Aug 2024 11:02:37 -0700 Subject: [PATCH 08/62] ci: yaml syntax --- .github/workflows/test.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7bfd1e34..dedfc05c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -28,9 +28,11 @@ jobs: - run: nix develop --command ./${{ matrix.script }}-${{ matrix.wasmer-feature }}.sh test-windows: + strategy: + fail-fast: false + matrix: + wasmer-feature: ["wasmer_sys", "wasmer_wamr"] runs-on: windows-latest - matrix: - wasmer-feature: ["wasmer_sys", "wasmer_wamr"] steps: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable From 7da05db810a1f882cb632d4d7e1dff09ac43c88d Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 30 Aug 2024 11:05:23 -0700 Subject: [PATCH 09/62] fix: scripts path changed --- .github/workflows/test.yml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index dedfc05c..ebcfbc4a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,7 +12,7 @@ jobs: fail-fast: false matrix: script: ["test", "bench"] - os: ["ubuntu-latest", "macos-latest"] + os: ["ubuntu-latest", "macos-latest", "windows-latest"] wasmer-feature: ["wasmer_sys", "wasmer_wamr"] runs-on: ${{ matrix.os }} steps: @@ -25,7 +25,7 @@ jobs: with: name: holochain-ci authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}" - - run: nix develop --command ./${{ matrix.script }}-${{ matrix.wasmer-feature }}.sh + - run: nix develop --command ./scripts/${{ matrix.script }}-${{ matrix.wasmer-feature }}.sh test-windows: strategy: @@ -42,5 +42,17 @@ jobs: run: cargo test --release --no-default-features --features ${{ matrix.wasmer-feature }} -- --nocapture - name: test run: cargo test --release --manifest-path test/Cargo.toml --no-default-features --features ${{ matrix.wasmer-feature }} -- --nocapture + + bench-windows: + strategy: + fail-fast: false + matrix: + wasmer-feature: ["wasmer_sys", "wasmer_wamr"] + runs-on: windows-latest + steps: + - uses: actions/checkout@v4 + - uses: dtolnay/rust-toolchain@stable + with: + targets: wasm32-unknown-unknown - name: bench run: cd test && cargo bench --no-default-features --features ${{ matrix.wasmer-feature }} \ No newline at end of file From f1f6960401391117547662a491c1e74a905f379d Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 30 Aug 2024 11:09:19 -0700 Subject: [PATCH 10/62] fix: rm windows target --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ebcfbc4a..265d838a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,7 +12,7 @@ jobs: fail-fast: false matrix: script: ["test", "bench"] - os: ["ubuntu-latest", "macos-latest", "windows-latest"] + os: ["ubuntu-latest", "macos-latest"] wasmer-feature: ["wasmer_sys", "wasmer_wamr"] runs-on: ${{ matrix.os }} steps: From e8e1d7ba540bd9ce0a79965435fc128645cad534 Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 30 Aug 2024 11:13:36 -0700 Subject: [PATCH 11/62] fix: include error_as_host feature, only run static tests once --- scripts/test-wasmer_sys.sh | 10 ++++++---- scripts/test-wasmer_wamr.sh | 5 +---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/scripts/test-wasmer_sys.sh b/scripts/test-wasmer_sys.sh index ecab6a3f..0698d5c1 100755 --- a/scripts/test-wasmer_sys.sh +++ b/scripts/test-wasmer_sys.sh @@ -3,19 +3,21 @@ set -euxo pipefail export RUST_BACKTRACE=full export WASMER_BACKTRACE=1 + +# static tests cargo fmt -( cd test && cargo fmt ) -( cd crates/guest && cargo fmt ) +( cd test && cargo fmt --check ) +( cd crates/guest && cargo fmt --check ) cargo clippy ( cd test && cargo clippy ) ( cd crates/guest && cargo clippy --target wasm32-unknown-unknown ) # tests the root workspace that doesn't include any wasm code -cargo test --no-default-features --features wasmer_sys ${1-} -- --nocapture +cargo test --no-default-features --features error_as_host,wasmer_sys ${1-} -- --nocapture # test that everything builds cargo build --release --manifest-path test/test_wasm/Cargo.toml --target wasm32-unknown-unknown # build wasm and run the "full" tests for wasmer_sys -cargo test --release --manifest-path test/Cargo.toml --no-default-features --features wasmer_sys ${1-} -- --nocapture +cargo test --release --manifest-path test/Cargo.toml --no-default-features --features error_as_host,wasmer_sys ${1-} -- --nocapture diff --git a/scripts/test-wasmer_wamr.sh b/scripts/test-wasmer_wamr.sh index a565bcee..30830b9f 100755 --- a/scripts/test-wasmer_wamr.sh +++ b/scripts/test-wasmer_wamr.sh @@ -4,8 +4,5 @@ set -euxo pipefail export RUST_BACKTRACE=full export WASMER_BACKTRACE=1 -cargo clippy --no-default-features --features wasmer_wamr -( cd test && cargo clippy --no-default-features --features wasmer_wamr ) - # build wasm and run the "full" tests for wasmer_wamr -cargo test --release --manifest-path test/Cargo.toml --no-default-features --features wasmer_wamr ${1-} -- --nocapture +cargo test --release --manifest-path test/Cargo.toml --no-default-features --features error_as_host,wasmer_wamr ${1-} -- --nocapture From e4994bbfa06214efcff3e8648088b122f7c2314e Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 30 Aug 2024 11:14:49 -0700 Subject: [PATCH 12/62] ci: cancel previous superceeded jobs --- .github/workflows/test.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 265d838a..b3b92be6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -6,6 +6,10 @@ on: - develop pull_request: {} +concurrency: + group: ${{ github.head_ref }} + cancel-in-progress: true + jobs: test: strategy: From 3a2c0e92eb16f91b3c202a786e0033063c8a9888 Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 30 Aug 2024 11:21:21 -0700 Subject: [PATCH 13/62] fix: remove feature --- .github/workflows/test.yml | 2 +- scripts/test-wasmer_sys.sh | 2 +- scripts/test-wasmer_wamr.sh | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b3b92be6..310a5e7c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,7 +11,7 @@ concurrency: cancel-in-progress: true jobs: - test: + test-and-bench: strategy: fail-fast: false matrix: diff --git a/scripts/test-wasmer_sys.sh b/scripts/test-wasmer_sys.sh index 0698d5c1..e748cad9 100755 --- a/scripts/test-wasmer_sys.sh +++ b/scripts/test-wasmer_sys.sh @@ -20,4 +20,4 @@ cargo test --no-default-features --features error_as_host,wasmer_sys ${1-} -- -- cargo build --release --manifest-path test/test_wasm/Cargo.toml --target wasm32-unknown-unknown # build wasm and run the "full" tests for wasmer_sys -cargo test --release --manifest-path test/Cargo.toml --no-default-features --features error_as_host,wasmer_sys ${1-} -- --nocapture +cargo test --release --manifest-path test/Cargo.toml --no-default-features --features wasmer_sys ${1-} -- --nocapture diff --git a/scripts/test-wasmer_wamr.sh b/scripts/test-wasmer_wamr.sh index 30830b9f..46b1d639 100755 --- a/scripts/test-wasmer_wamr.sh +++ b/scripts/test-wasmer_wamr.sh @@ -4,5 +4,9 @@ set -euxo pipefail export RUST_BACKTRACE=full export WASMER_BACKTRACE=1 + +# tests the root workspace that doesn't include any wasm code +cargo test --no-default-features --features error_as_host,wasmer_wamr ${1-} -- --nocapture + # build wasm and run the "full" tests for wasmer_wamr -cargo test --release --manifest-path test/Cargo.toml --no-default-features --features error_as_host,wasmer_wamr ${1-} -- --nocapture +cargo test --release --manifest-path test/Cargo.toml --no-default-features --features wasmer_wamr ${1-} -- --nocapture From 63d9dd5dfb4b32a5497a551aa0f503baed86adf9 Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 30 Aug 2024 12:18:15 -0700 Subject: [PATCH 14/62] fix: missing error_as_host feature --- .github/workflows/test.yml | 4 ++-- scripts/bench-wasmer_sys.sh | 2 +- scripts/bench-wasmer_wamr.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 310a5e7c..0781469b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -43,7 +43,7 @@ jobs: with: targets: wasm32-unknown-unknown - name: test root - run: cargo test --release --no-default-features --features ${{ matrix.wasmer-feature }} -- --nocapture + run: cargo test --release --no-default-features --features error_as_host,${{ matrix.wasmer-feature }} -- --nocapture - name: test run: cargo test --release --manifest-path test/Cargo.toml --no-default-features --features ${{ matrix.wasmer-feature }} -- --nocapture @@ -59,4 +59,4 @@ jobs: with: targets: wasm32-unknown-unknown - name: bench - run: cd test && cargo bench --no-default-features --features ${{ matrix.wasmer-feature }} \ No newline at end of file + run: cd test && cargo bench --no-default-features --features error_as_host,${{ matrix.wasmer-feature }} \ No newline at end of file diff --git a/scripts/bench-wasmer_sys.sh b/scripts/bench-wasmer_sys.sh index 63909ae5..407a801c 100755 --- a/scripts/bench-wasmer_sys.sh +++ b/scripts/bench-wasmer_sys.sh @@ -1,7 +1,7 @@ #! /usr/bin/env bash ( cd test && \ - cargo bench --no-default-features --features wasmer_sys + cargo bench --no-default-features --features error_as_host,wasmer_sys ) # it's possible to flamegraph the benchmarks like this: diff --git a/scripts/bench-wasmer_wamr.sh b/scripts/bench-wasmer_wamr.sh index 0fe9b6a8..52ae2d49 100755 --- a/scripts/bench-wasmer_wamr.sh +++ b/scripts/bench-wasmer_wamr.sh @@ -1,7 +1,7 @@ #! /usr/bin/env bash ( cd test && \ - cargo bench --no-default-features --features wasmer_wamr + cargo bench --no-default-features --features error_as_host,wasmer_wamr ) # it's possible to flamegraph the benchmarks like this: From 44a8af5ca558e86d5547ed34a92c03aeb3695b1d Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 30 Aug 2024 12:21:28 -0700 Subject: [PATCH 15/62] wip: switch to hc-wasmer fork with win32 fix --- Cargo.lock | 15 +++++---------- crates/host/Cargo.toml | 3 ++- test/Cargo.lock | 15 +++++---------- test/Cargo.toml | 5 +++-- 4 files changed, 15 insertions(+), 23 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8c31c5cd..8fb2af46 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -818,8 +818,7 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hc-wasmer" version = "4.3.6-hc.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da36c1b427d5ab3b2bca996741a29538f6fba4b0a5dfe20e14fa0d32ec936e3" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#864327df021e4bec0ad1cb1bab1077a7aa486e0d" dependencies = [ "bindgen", "bytes", @@ -851,8 +850,7 @@ dependencies = [ [[package]] name = "hc-wasmer-compiler" version = "4.3.6-hc.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f63537e3d2aa18c9e7e0068d54be75b1a068f53eb7f1b7f7f3b528acd1e75e7" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#864327df021e4bec0ad1cb1bab1077a7aa486e0d" dependencies = [ "backtrace", "bytes", @@ -879,8 +877,7 @@ dependencies = [ [[package]] name = "hc-wasmer-derive" version = "4.3.6-hc.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "050c01c0e3193bc69b8cbdc47ec432a42aa4dc64964fc500e6740a12801694dc" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#864327df021e4bec0ad1cb1bab1077a7aa486e0d" dependencies = [ "proc-macro-error", "proc-macro2", @@ -891,8 +888,7 @@ dependencies = [ [[package]] name = "hc-wasmer-types" version = "4.3.6-hc.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7832ae1364df93ef680b31523c348204f25810e513b66dfd99d406d985d3e0e5" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#864327df021e4bec0ad1cb1bab1077a7aa486e0d" dependencies = [ "bytecheck", "enum-iterator", @@ -911,8 +907,7 @@ dependencies = [ [[package]] name = "hc-wasmer-vm" version = "4.3.6-hc.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6166b3a7b61b64cc71851a33cf01cc5dc8b159f5d05c2d2f650969016032c22f" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#864327df021e4bec0ad1cb1bab1077a7aa486e0d" dependencies = [ "backtrace", "cc", diff --git a/crates/host/Cargo.toml b/crates/host/Cargo.toml index dbd29d6a..82a18089 100644 --- a/crates/host/Cargo.toml +++ b/crates/host/Cargo.toml @@ -11,7 +11,8 @@ wasmer = { version = "=4.3.6", optional = true, default-feature = false } wasmer-middlewares = { version = "=4.3.6", optional = true, default-feature = false } # Temporarily include a fork of wasmer from the git branch 'wamr', until it is officially released in wasmer v5 -hc-wasmer = { version="=4.3.6-hc.1", optional = true, default-features = false } +#hc-wasmer = { version="=4.3.6-hc.1", optional = true, default-features = false } +hc-wasmer = { git = "https://github.com/holochain/wasmer", branch = "fix/win32-build", optional = true, default-features = false } holochain_wasmer_common = { version = "=0.0.96", path = "../common" } holochain_serialized_bytes = "=0.0.55" diff --git a/test/Cargo.lock b/test/Cargo.lock index 9cb796ab..e306eb9a 100644 --- a/test/Cargo.lock +++ b/test/Cargo.lock @@ -971,8 +971,7 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hc-wasmer" version = "4.3.6-hc.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da36c1b427d5ab3b2bca996741a29538f6fba4b0a5dfe20e14fa0d32ec936e3" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#864327df021e4bec0ad1cb1bab1077a7aa486e0d" dependencies = [ "bindgen", "bytes", @@ -1004,8 +1003,7 @@ dependencies = [ [[package]] name = "hc-wasmer-compiler" version = "4.3.6-hc.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f63537e3d2aa18c9e7e0068d54be75b1a068f53eb7f1b7f7f3b528acd1e75e7" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#864327df021e4bec0ad1cb1bab1077a7aa486e0d" dependencies = [ "backtrace", "bytes", @@ -1032,8 +1030,7 @@ dependencies = [ [[package]] name = "hc-wasmer-derive" version = "4.3.6-hc.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "050c01c0e3193bc69b8cbdc47ec432a42aa4dc64964fc500e6740a12801694dc" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#864327df021e4bec0ad1cb1bab1077a7aa486e0d" dependencies = [ "proc-macro-error", "proc-macro2", @@ -1044,8 +1041,7 @@ dependencies = [ [[package]] name = "hc-wasmer-types" version = "4.3.6-hc.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7832ae1364df93ef680b31523c348204f25810e513b66dfd99d406d985d3e0e5" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#864327df021e4bec0ad1cb1bab1077a7aa486e0d" dependencies = [ "bytecheck", "enum-iterator", @@ -1064,8 +1060,7 @@ dependencies = [ [[package]] name = "hc-wasmer-vm" version = "4.3.6-hc.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6166b3a7b61b64cc71851a33cf01cc5dc8b159f5d05c2d2f650969016032c22f" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#864327df021e4bec0ad1cb1bab1077a7aa486e0d" dependencies = [ "backtrace", "cc", diff --git a/test/Cargo.toml b/test/Cargo.toml index c5d531ad..e0623fef 100644 --- a/test/Cargo.toml +++ b/test/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" [dependencies] holochain_wasmer_common = { path = "../crates/common" } -holochain_wasmer_host = { path = "../crates/host", default-features = false } +holochain_wasmer_host = { path = "../crates/host", default-features = false, features = ["error_as_host"] } holochain_serialized_bytes = "=0.0.55" serde = "1" test_common = { path = "./common", default-features = false } @@ -22,7 +22,8 @@ wasmer = { version = "=4.3.6", optional = true, default-features = false } wasmer-middlewares = { version = "=4.3.6", optional = true, default-features = false } # Temporarily include a fork of wasmer from the git branch 'wamr', until it is officially released in wasmer v5 -hc-wasmer = { version="=4.3.6-hc.1", optional = true, default-features = false } +#hc-wasmer = { version="=4.3.6-hc.1", optional = true, default-features = false } +hc-wasmer = { git = "https://github.com/holochain/wasmer", branch = "fix/win32-build", optional = true, default-features = false } [dev-dependencies] env_logger = "0.8" From 4fddfc38d09badb93f7e02d5bf179b6bc83e62b6 Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 30 Aug 2024 12:22:10 -0700 Subject: [PATCH 16/62] wip: only test win32 wasmer_wamr --- .github/workflows/test.yml | 69 ++++++++++++++++++++------------------ 1 file changed, 36 insertions(+), 33 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0781469b..ea36c8e3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,31 +11,34 @@ concurrency: cancel-in-progress: true jobs: - test-and-bench: - strategy: - fail-fast: false - matrix: - script: ["test", "bench"] - os: ["ubuntu-latest", "macos-latest"] - wasmer-feature: ["wasmer_sys", "wasmer_wamr"] - runs-on: ${{ matrix.os }} - steps: - - uses: actions/checkout@v4 - - name: Install nix - uses: cachix/install-nix-action@v26 - - name: Setup cachix - uses: cachix/cachix-action@v14 - if: ${{ ! contains(matrix.platform.runs-on, 'self-hosted') }} - with: - name: holochain-ci - authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}" - - run: nix develop --command ./scripts/${{ matrix.script }}-${{ matrix.wasmer-feature }}.sh + # test-and-bench: + # strategy: + # fail-fast: false + # matrix: + # script: ["test", "bench"] + # os: ["ubuntu-latest", "macos-latest"] + # wasmer-feature: ["wasmer_sys", "wasmer_wamr"] + # runs-on: ${{ matrix.os }} + # steps: + # - uses: actions/checkout@v4 + # - name: Install nix + # uses: cachix/install-nix-action@v26 + # - name: Setup cachix + # uses: cachix/cachix-action@v14 + # if: ${{ ! contains(matrix.platform.runs-on, 'self-hosted') }} + # with: + # name: holochain-ci + # authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}" + # - run: nix develop --command ./scripts/${{ matrix.script }}-${{ matrix.wasmer-feature }}.sh test-windows: strategy: fail-fast: false matrix: - wasmer-feature: ["wasmer_sys", "wasmer_wamr"] + wasmer-feature: [ + # "wasmer_sys", + "wasmer_wamr" + ] runs-on: windows-latest steps: - uses: actions/checkout@v4 @@ -47,16 +50,16 @@ jobs: - name: test run: cargo test --release --manifest-path test/Cargo.toml --no-default-features --features ${{ matrix.wasmer-feature }} -- --nocapture - bench-windows: - strategy: - fail-fast: false - matrix: - wasmer-feature: ["wasmer_sys", "wasmer_wamr"] - runs-on: windows-latest - steps: - - uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@stable - with: - targets: wasm32-unknown-unknown - - name: bench - run: cd test && cargo bench --no-default-features --features error_as_host,${{ matrix.wasmer-feature }} \ No newline at end of file + # bench-windows: + # strategy: + # fail-fast: false + # matrix: + # wasmer-feature: ["wasmer_sys", "wasmer_wamr"] + # runs-on: windows-latest + # steps: + # - uses: actions/checkout@v4 + # - uses: dtolnay/rust-toolchain@stable + # with: + # targets: wasm32-unknown-unknown + # - name: bench + # run: cd test && cargo bench --no-default-features --features error_as_host,${{ matrix.wasmer-feature }} \ No newline at end of file From bd0cec3ea43e6a37020e030e296c8464714e9e65 Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 30 Aug 2024 13:45:32 -0700 Subject: [PATCH 17/62] wip: try to get windows building in ci --- .github/workflows/test.yml | 5 +++++ test/Cargo.lock | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ea36c8e3..9bcf3e2a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -45,6 +45,11 @@ jobs: - uses: dtolnay/rust-toolchain@stable with: targets: wasm32-unknown-unknown + - name: install cmake & gcc + if: matrix.os == 'windows-latest' && matrix.wasmer-feature == 'wasmer_wamr' + uses: MinoruSekine/setup-scoop@v4 + with: + apps: main/cmake main/gcc main/make - name: test root run: cargo test --release --no-default-features --features error_as_host,${{ matrix.wasmer-feature }} -- --nocapture - name: test diff --git a/test/Cargo.lock b/test/Cargo.lock index e306eb9a..c4162913 100644 --- a/test/Cargo.lock +++ b/test/Cargo.lock @@ -971,7 +971,7 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hc-wasmer" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#864327df021e4bec0ad1cb1bab1077a7aa486e0d" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#40443322b7dd4b15043b851441be40afba98fdb1" dependencies = [ "bindgen", "bytes", @@ -1003,7 +1003,7 @@ dependencies = [ [[package]] name = "hc-wasmer-compiler" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#864327df021e4bec0ad1cb1bab1077a7aa486e0d" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#40443322b7dd4b15043b851441be40afba98fdb1" dependencies = [ "backtrace", "bytes", @@ -1030,7 +1030,7 @@ dependencies = [ [[package]] name = "hc-wasmer-derive" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#864327df021e4bec0ad1cb1bab1077a7aa486e0d" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#40443322b7dd4b15043b851441be40afba98fdb1" dependencies = [ "proc-macro-error", "proc-macro2", @@ -1041,7 +1041,7 @@ dependencies = [ [[package]] name = "hc-wasmer-types" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#864327df021e4bec0ad1cb1bab1077a7aa486e0d" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#40443322b7dd4b15043b851441be40afba98fdb1" dependencies = [ "bytecheck", "enum-iterator", @@ -1060,7 +1060,7 @@ dependencies = [ [[package]] name = "hc-wasmer-vm" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#864327df021e4bec0ad1cb1bab1077a7aa486e0d" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#40443322b7dd4b15043b851441be40afba98fdb1" dependencies = [ "backtrace", "cc", From 3494a1aa81001737d1c27ceb4be74a6476714351 Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 30 Aug 2024 13:52:54 -0700 Subject: [PATCH 18/62] build: bump hc-wasmer --- Cargo.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8fb2af46..7e20fa71 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -818,7 +818,7 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hc-wasmer" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#864327df021e4bec0ad1cb1bab1077a7aa486e0d" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#40443322b7dd4b15043b851441be40afba98fdb1" dependencies = [ "bindgen", "bytes", @@ -850,7 +850,7 @@ dependencies = [ [[package]] name = "hc-wasmer-compiler" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#864327df021e4bec0ad1cb1bab1077a7aa486e0d" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#40443322b7dd4b15043b851441be40afba98fdb1" dependencies = [ "backtrace", "bytes", @@ -877,7 +877,7 @@ dependencies = [ [[package]] name = "hc-wasmer-derive" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#864327df021e4bec0ad1cb1bab1077a7aa486e0d" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#40443322b7dd4b15043b851441be40afba98fdb1" dependencies = [ "proc-macro-error", "proc-macro2", @@ -888,7 +888,7 @@ dependencies = [ [[package]] name = "hc-wasmer-types" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#864327df021e4bec0ad1cb1bab1077a7aa486e0d" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#40443322b7dd4b15043b851441be40afba98fdb1" dependencies = [ "bytecheck", "enum-iterator", @@ -907,7 +907,7 @@ dependencies = [ [[package]] name = "hc-wasmer-vm" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#864327df021e4bec0ad1cb1bab1077a7aa486e0d" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#40443322b7dd4b15043b851441be40afba98fdb1" dependencies = [ "backtrace", "cc", From 57315e02afbd4542b17662b6e5e94fee3222bf6f Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 30 Aug 2024 14:02:51 -0700 Subject: [PATCH 19/62] wip: try mingw instead --- .github/workflows/test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9bcf3e2a..14288896 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -49,7 +49,8 @@ jobs: if: matrix.os == 'windows-latest' && matrix.wasmer-feature == 'wasmer_wamr' uses: MinoruSekine/setup-scoop@v4 with: - apps: main/cmake main/gcc main/make + bucket: versions + apps: versions/mingw-winlibs-llvm - name: test root run: cargo test --release --no-default-features --features error_as_host,${{ matrix.wasmer-feature }} -- --nocapture - name: test From 5ee2e5d8ef4771b138970d79d93585890d8ad0e1 Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 30 Aug 2024 14:08:54 -0700 Subject: [PATCH 20/62] wip: install newer cmake --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 14288896..345dae82 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -50,7 +50,7 @@ jobs: uses: MinoruSekine/setup-scoop@v4 with: bucket: versions - apps: versions/mingw-winlibs-llvm + apps: versions/mingw-winlibs-llvm main/cmake - name: test root run: cargo test --release --no-default-features --features error_as_host,${{ matrix.wasmer-feature }} -- --nocapture - name: test From 9052f8a85f38f22e67604e204139f7c03e28d46e Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 30 Aug 2024 14:11:31 -0700 Subject: [PATCH 21/62] wip: try msys --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 345dae82..429ee13e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -45,12 +45,12 @@ jobs: - uses: dtolnay/rust-toolchain@stable with: targets: wasm32-unknown-unknown - - name: install cmake & gcc + - name: install gcc if: matrix.os == 'windows-latest' && matrix.wasmer-feature == 'wasmer_wamr' uses: MinoruSekine/setup-scoop@v4 with: bucket: versions - apps: versions/mingw-winlibs-llvm main/cmake + apps: main/msys - name: test root run: cargo test --release --no-default-features --features error_as_host,${{ matrix.wasmer-feature }} -- --nocapture - name: test From 5d4b7efbfdca42d7472fffe85cab9dda185087bf Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 30 Aug 2024 14:12:00 -0700 Subject: [PATCH 22/62] wip: try msys2 --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 429ee13e..98d1bbaa 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -50,7 +50,7 @@ jobs: uses: MinoruSekine/setup-scoop@v4 with: bucket: versions - apps: main/msys + apps: main/msys2 - name: test root run: cargo test --release --no-default-features --features error_as_host,${{ matrix.wasmer-feature }} -- --nocapture - name: test From 07d12b45b16c265ebe187866ea6ca509c102f900 Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 30 Aug 2024 15:08:27 -0700 Subject: [PATCH 23/62] build: bump cargo lock --- Cargo.lock | 10 +++++----- test/Cargo.lock | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7e20fa71..c712eaed 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -818,7 +818,7 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hc-wasmer" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#40443322b7dd4b15043b851441be40afba98fdb1" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#0a10e96adde15807c460ce1c7ce5e8f1ff45e5a4" dependencies = [ "bindgen", "bytes", @@ -850,7 +850,7 @@ dependencies = [ [[package]] name = "hc-wasmer-compiler" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#40443322b7dd4b15043b851441be40afba98fdb1" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#0a10e96adde15807c460ce1c7ce5e8f1ff45e5a4" dependencies = [ "backtrace", "bytes", @@ -877,7 +877,7 @@ dependencies = [ [[package]] name = "hc-wasmer-derive" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#40443322b7dd4b15043b851441be40afba98fdb1" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#0a10e96adde15807c460ce1c7ce5e8f1ff45e5a4" dependencies = [ "proc-macro-error", "proc-macro2", @@ -888,7 +888,7 @@ dependencies = [ [[package]] name = "hc-wasmer-types" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#40443322b7dd4b15043b851441be40afba98fdb1" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#0a10e96adde15807c460ce1c7ce5e8f1ff45e5a4" dependencies = [ "bytecheck", "enum-iterator", @@ -907,7 +907,7 @@ dependencies = [ [[package]] name = "hc-wasmer-vm" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#40443322b7dd4b15043b851441be40afba98fdb1" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#0a10e96adde15807c460ce1c7ce5e8f1ff45e5a4" dependencies = [ "backtrace", "cc", diff --git a/test/Cargo.lock b/test/Cargo.lock index c4162913..ed175da6 100644 --- a/test/Cargo.lock +++ b/test/Cargo.lock @@ -971,7 +971,7 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hc-wasmer" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#40443322b7dd4b15043b851441be40afba98fdb1" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#0a10e96adde15807c460ce1c7ce5e8f1ff45e5a4" dependencies = [ "bindgen", "bytes", @@ -1003,7 +1003,7 @@ dependencies = [ [[package]] name = "hc-wasmer-compiler" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#40443322b7dd4b15043b851441be40afba98fdb1" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#0a10e96adde15807c460ce1c7ce5e8f1ff45e5a4" dependencies = [ "backtrace", "bytes", @@ -1030,7 +1030,7 @@ dependencies = [ [[package]] name = "hc-wasmer-derive" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#40443322b7dd4b15043b851441be40afba98fdb1" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#0a10e96adde15807c460ce1c7ce5e8f1ff45e5a4" dependencies = [ "proc-macro-error", "proc-macro2", @@ -1041,7 +1041,7 @@ dependencies = [ [[package]] name = "hc-wasmer-types" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#40443322b7dd4b15043b851441be40afba98fdb1" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#0a10e96adde15807c460ce1c7ce5e8f1ff45e5a4" dependencies = [ "bytecheck", "enum-iterator", @@ -1060,7 +1060,7 @@ dependencies = [ [[package]] name = "hc-wasmer-vm" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#40443322b7dd4b15043b851441be40afba98fdb1" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#0a10e96adde15807c460ce1c7ce5e8f1ff45e5a4" dependencies = [ "backtrace", "cc", From 9e1a670b58b45718cb4665d99b91bef078f52693 Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 30 Aug 2024 15:37:58 -0700 Subject: [PATCH 24/62] build: bump cargo lock --- Cargo.lock | 10 +++++----- test/Cargo.lock | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c712eaed..5c4b88a6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -818,7 +818,7 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hc-wasmer" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#0a10e96adde15807c460ce1c7ce5e8f1ff45e5a4" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#a83bcce3f9ac550625062829024ec6062e57a616" dependencies = [ "bindgen", "bytes", @@ -850,7 +850,7 @@ dependencies = [ [[package]] name = "hc-wasmer-compiler" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#0a10e96adde15807c460ce1c7ce5e8f1ff45e5a4" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#a83bcce3f9ac550625062829024ec6062e57a616" dependencies = [ "backtrace", "bytes", @@ -877,7 +877,7 @@ dependencies = [ [[package]] name = "hc-wasmer-derive" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#0a10e96adde15807c460ce1c7ce5e8f1ff45e5a4" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#a83bcce3f9ac550625062829024ec6062e57a616" dependencies = [ "proc-macro-error", "proc-macro2", @@ -888,7 +888,7 @@ dependencies = [ [[package]] name = "hc-wasmer-types" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#0a10e96adde15807c460ce1c7ce5e8f1ff45e5a4" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#a83bcce3f9ac550625062829024ec6062e57a616" dependencies = [ "bytecheck", "enum-iterator", @@ -907,7 +907,7 @@ dependencies = [ [[package]] name = "hc-wasmer-vm" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#0a10e96adde15807c460ce1c7ce5e8f1ff45e5a4" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#a83bcce3f9ac550625062829024ec6062e57a616" dependencies = [ "backtrace", "cc", diff --git a/test/Cargo.lock b/test/Cargo.lock index ed175da6..65a84bb9 100644 --- a/test/Cargo.lock +++ b/test/Cargo.lock @@ -971,7 +971,7 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hc-wasmer" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#0a10e96adde15807c460ce1c7ce5e8f1ff45e5a4" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#a83bcce3f9ac550625062829024ec6062e57a616" dependencies = [ "bindgen", "bytes", @@ -1003,7 +1003,7 @@ dependencies = [ [[package]] name = "hc-wasmer-compiler" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#0a10e96adde15807c460ce1c7ce5e8f1ff45e5a4" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#a83bcce3f9ac550625062829024ec6062e57a616" dependencies = [ "backtrace", "bytes", @@ -1030,7 +1030,7 @@ dependencies = [ [[package]] name = "hc-wasmer-derive" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#0a10e96adde15807c460ce1c7ce5e8f1ff45e5a4" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#a83bcce3f9ac550625062829024ec6062e57a616" dependencies = [ "proc-macro-error", "proc-macro2", @@ -1041,7 +1041,7 @@ dependencies = [ [[package]] name = "hc-wasmer-types" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#0a10e96adde15807c460ce1c7ce5e8f1ff45e5a4" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#a83bcce3f9ac550625062829024ec6062e57a616" dependencies = [ "bytecheck", "enum-iterator", @@ -1060,7 +1060,7 @@ dependencies = [ [[package]] name = "hc-wasmer-vm" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#0a10e96adde15807c460ce1c7ce5e8f1ff45e5a4" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#a83bcce3f9ac550625062829024ec6062e57a616" dependencies = [ "backtrace", "cc", From 921e7cf7f80fcb76036eff1f32ef5724cd9477cd Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 30 Aug 2024 15:43:56 -0700 Subject: [PATCH 25/62] build: bump cargo lock --- Cargo.lock | 10 +++++----- test/Cargo.lock | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5c4b88a6..02258661 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -818,7 +818,7 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hc-wasmer" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#a83bcce3f9ac550625062829024ec6062e57a616" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#5d68e0be1e30e684ef1e1344e21518187442985b" dependencies = [ "bindgen", "bytes", @@ -850,7 +850,7 @@ dependencies = [ [[package]] name = "hc-wasmer-compiler" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#a83bcce3f9ac550625062829024ec6062e57a616" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#5d68e0be1e30e684ef1e1344e21518187442985b" dependencies = [ "backtrace", "bytes", @@ -877,7 +877,7 @@ dependencies = [ [[package]] name = "hc-wasmer-derive" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#a83bcce3f9ac550625062829024ec6062e57a616" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#5d68e0be1e30e684ef1e1344e21518187442985b" dependencies = [ "proc-macro-error", "proc-macro2", @@ -888,7 +888,7 @@ dependencies = [ [[package]] name = "hc-wasmer-types" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#a83bcce3f9ac550625062829024ec6062e57a616" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#5d68e0be1e30e684ef1e1344e21518187442985b" dependencies = [ "bytecheck", "enum-iterator", @@ -907,7 +907,7 @@ dependencies = [ [[package]] name = "hc-wasmer-vm" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#a83bcce3f9ac550625062829024ec6062e57a616" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#5d68e0be1e30e684ef1e1344e21518187442985b" dependencies = [ "backtrace", "cc", diff --git a/test/Cargo.lock b/test/Cargo.lock index 65a84bb9..78f1802e 100644 --- a/test/Cargo.lock +++ b/test/Cargo.lock @@ -971,7 +971,7 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hc-wasmer" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#a83bcce3f9ac550625062829024ec6062e57a616" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#5d68e0be1e30e684ef1e1344e21518187442985b" dependencies = [ "bindgen", "bytes", @@ -1003,7 +1003,7 @@ dependencies = [ [[package]] name = "hc-wasmer-compiler" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#a83bcce3f9ac550625062829024ec6062e57a616" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#5d68e0be1e30e684ef1e1344e21518187442985b" dependencies = [ "backtrace", "bytes", @@ -1030,7 +1030,7 @@ dependencies = [ [[package]] name = "hc-wasmer-derive" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#a83bcce3f9ac550625062829024ec6062e57a616" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#5d68e0be1e30e684ef1e1344e21518187442985b" dependencies = [ "proc-macro-error", "proc-macro2", @@ -1041,7 +1041,7 @@ dependencies = [ [[package]] name = "hc-wasmer-types" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#a83bcce3f9ac550625062829024ec6062e57a616" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#5d68e0be1e30e684ef1e1344e21518187442985b" dependencies = [ "bytecheck", "enum-iterator", @@ -1060,7 +1060,7 @@ dependencies = [ [[package]] name = "hc-wasmer-vm" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#a83bcce3f9ac550625062829024ec6062e57a616" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#5d68e0be1e30e684ef1e1344e21518187442985b" dependencies = [ "backtrace", "cc", From 936089ca3477467b65d5193fe4765acf840be3d1 Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 30 Aug 2024 15:49:46 -0700 Subject: [PATCH 26/62] build: bump cargo lock --- .github/workflows/test.yml | 1 - Cargo.lock | 10 +++++----- test/Cargo.lock | 10 +++++----- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 98d1bbaa..84096fbd 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -46,7 +46,6 @@ jobs: with: targets: wasm32-unknown-unknown - name: install gcc - if: matrix.os == 'windows-latest' && matrix.wasmer-feature == 'wasmer_wamr' uses: MinoruSekine/setup-scoop@v4 with: bucket: versions diff --git a/Cargo.lock b/Cargo.lock index 02258661..e17b4052 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -818,7 +818,7 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hc-wasmer" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#5d68e0be1e30e684ef1e1344e21518187442985b" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#d773bba524c154868a372048cb9da968064e9477" dependencies = [ "bindgen", "bytes", @@ -850,7 +850,7 @@ dependencies = [ [[package]] name = "hc-wasmer-compiler" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#5d68e0be1e30e684ef1e1344e21518187442985b" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#d773bba524c154868a372048cb9da968064e9477" dependencies = [ "backtrace", "bytes", @@ -877,7 +877,7 @@ dependencies = [ [[package]] name = "hc-wasmer-derive" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#5d68e0be1e30e684ef1e1344e21518187442985b" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#d773bba524c154868a372048cb9da968064e9477" dependencies = [ "proc-macro-error", "proc-macro2", @@ -888,7 +888,7 @@ dependencies = [ [[package]] name = "hc-wasmer-types" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#5d68e0be1e30e684ef1e1344e21518187442985b" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#d773bba524c154868a372048cb9da968064e9477" dependencies = [ "bytecheck", "enum-iterator", @@ -907,7 +907,7 @@ dependencies = [ [[package]] name = "hc-wasmer-vm" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#5d68e0be1e30e684ef1e1344e21518187442985b" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#d773bba524c154868a372048cb9da968064e9477" dependencies = [ "backtrace", "cc", diff --git a/test/Cargo.lock b/test/Cargo.lock index 78f1802e..c237429a 100644 --- a/test/Cargo.lock +++ b/test/Cargo.lock @@ -971,7 +971,7 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hc-wasmer" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#5d68e0be1e30e684ef1e1344e21518187442985b" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#d773bba524c154868a372048cb9da968064e9477" dependencies = [ "bindgen", "bytes", @@ -1003,7 +1003,7 @@ dependencies = [ [[package]] name = "hc-wasmer-compiler" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#5d68e0be1e30e684ef1e1344e21518187442985b" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#d773bba524c154868a372048cb9da968064e9477" dependencies = [ "backtrace", "bytes", @@ -1030,7 +1030,7 @@ dependencies = [ [[package]] name = "hc-wasmer-derive" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#5d68e0be1e30e684ef1e1344e21518187442985b" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#d773bba524c154868a372048cb9da968064e9477" dependencies = [ "proc-macro-error", "proc-macro2", @@ -1041,7 +1041,7 @@ dependencies = [ [[package]] name = "hc-wasmer-types" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#5d68e0be1e30e684ef1e1344e21518187442985b" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#d773bba524c154868a372048cb9da968064e9477" dependencies = [ "bytecheck", "enum-iterator", @@ -1060,7 +1060,7 @@ dependencies = [ [[package]] name = "hc-wasmer-vm" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#5d68e0be1e30e684ef1e1344e21518187442985b" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#d773bba524c154868a372048cb9da968064e9477" dependencies = [ "backtrace", "cc", From 39d96536f0403d5911119a6d9c970ceb5b02efaa Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 30 Aug 2024 15:57:18 -0700 Subject: [PATCH 27/62] build: bump cargo lock --- Cargo.lock | 10 +++++----- test/Cargo.lock | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e17b4052..d0ac8b13 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -818,7 +818,7 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hc-wasmer" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#d773bba524c154868a372048cb9da968064e9477" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#c3bcc287d916fac852db07b5b8f6ab126b6bed5c" dependencies = [ "bindgen", "bytes", @@ -850,7 +850,7 @@ dependencies = [ [[package]] name = "hc-wasmer-compiler" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#d773bba524c154868a372048cb9da968064e9477" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#c3bcc287d916fac852db07b5b8f6ab126b6bed5c" dependencies = [ "backtrace", "bytes", @@ -877,7 +877,7 @@ dependencies = [ [[package]] name = "hc-wasmer-derive" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#d773bba524c154868a372048cb9da968064e9477" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#c3bcc287d916fac852db07b5b8f6ab126b6bed5c" dependencies = [ "proc-macro-error", "proc-macro2", @@ -888,7 +888,7 @@ dependencies = [ [[package]] name = "hc-wasmer-types" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#d773bba524c154868a372048cb9da968064e9477" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#c3bcc287d916fac852db07b5b8f6ab126b6bed5c" dependencies = [ "bytecheck", "enum-iterator", @@ -907,7 +907,7 @@ dependencies = [ [[package]] name = "hc-wasmer-vm" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#d773bba524c154868a372048cb9da968064e9477" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#c3bcc287d916fac852db07b5b8f6ab126b6bed5c" dependencies = [ "backtrace", "cc", diff --git a/test/Cargo.lock b/test/Cargo.lock index c237429a..edfa3645 100644 --- a/test/Cargo.lock +++ b/test/Cargo.lock @@ -971,7 +971,7 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hc-wasmer" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#d773bba524c154868a372048cb9da968064e9477" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#c3bcc287d916fac852db07b5b8f6ab126b6bed5c" dependencies = [ "bindgen", "bytes", @@ -1003,7 +1003,7 @@ dependencies = [ [[package]] name = "hc-wasmer-compiler" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#d773bba524c154868a372048cb9da968064e9477" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#c3bcc287d916fac852db07b5b8f6ab126b6bed5c" dependencies = [ "backtrace", "bytes", @@ -1030,7 +1030,7 @@ dependencies = [ [[package]] name = "hc-wasmer-derive" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#d773bba524c154868a372048cb9da968064e9477" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#c3bcc287d916fac852db07b5b8f6ab126b6bed5c" dependencies = [ "proc-macro-error", "proc-macro2", @@ -1041,7 +1041,7 @@ dependencies = [ [[package]] name = "hc-wasmer-types" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#d773bba524c154868a372048cb9da968064e9477" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#c3bcc287d916fac852db07b5b8f6ab126b6bed5c" dependencies = [ "bytecheck", "enum-iterator", @@ -1060,7 +1060,7 @@ dependencies = [ [[package]] name = "hc-wasmer-vm" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#d773bba524c154868a372048cb9da968064e9477" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#c3bcc287d916fac852db07b5b8f6ab126b6bed5c" dependencies = [ "backtrace", "cc", From 7bd6b192affd3426da683e11f0c94fc4f3534758 Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 30 Aug 2024 16:08:33 -0700 Subject: [PATCH 28/62] build: bump cargo lock --- .github/workflows/test.yml | 10 +++++----- Cargo.lock | 10 +++++----- test/Cargo.lock | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 84096fbd..fd21d0b1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -45,11 +45,11 @@ jobs: - uses: dtolnay/rust-toolchain@stable with: targets: wasm32-unknown-unknown - - name: install gcc - uses: MinoruSekine/setup-scoop@v4 - with: - bucket: versions - apps: main/msys2 + # - name: install gcc + # uses: MinoruSekine/setup-scoop@v4 + # with: + # bucket: versions + # apps: main/msys2 - name: test root run: cargo test --release --no-default-features --features error_as_host,${{ matrix.wasmer-feature }} -- --nocapture - name: test diff --git a/Cargo.lock b/Cargo.lock index d0ac8b13..7d6ff4d0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -818,7 +818,7 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hc-wasmer" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#c3bcc287d916fac852db07b5b8f6ab126b6bed5c" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#6940c4f1d4a2539f705960d7315e5f89a3bb8c97" dependencies = [ "bindgen", "bytes", @@ -850,7 +850,7 @@ dependencies = [ [[package]] name = "hc-wasmer-compiler" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#c3bcc287d916fac852db07b5b8f6ab126b6bed5c" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#6940c4f1d4a2539f705960d7315e5f89a3bb8c97" dependencies = [ "backtrace", "bytes", @@ -877,7 +877,7 @@ dependencies = [ [[package]] name = "hc-wasmer-derive" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#c3bcc287d916fac852db07b5b8f6ab126b6bed5c" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#6940c4f1d4a2539f705960d7315e5f89a3bb8c97" dependencies = [ "proc-macro-error", "proc-macro2", @@ -888,7 +888,7 @@ dependencies = [ [[package]] name = "hc-wasmer-types" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#c3bcc287d916fac852db07b5b8f6ab126b6bed5c" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#6940c4f1d4a2539f705960d7315e5f89a3bb8c97" dependencies = [ "bytecheck", "enum-iterator", @@ -907,7 +907,7 @@ dependencies = [ [[package]] name = "hc-wasmer-vm" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#c3bcc287d916fac852db07b5b8f6ab126b6bed5c" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#6940c4f1d4a2539f705960d7315e5f89a3bb8c97" dependencies = [ "backtrace", "cc", diff --git a/test/Cargo.lock b/test/Cargo.lock index edfa3645..1f80fd1b 100644 --- a/test/Cargo.lock +++ b/test/Cargo.lock @@ -971,7 +971,7 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hc-wasmer" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#c3bcc287d916fac852db07b5b8f6ab126b6bed5c" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#6940c4f1d4a2539f705960d7315e5f89a3bb8c97" dependencies = [ "bindgen", "bytes", @@ -1003,7 +1003,7 @@ dependencies = [ [[package]] name = "hc-wasmer-compiler" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#c3bcc287d916fac852db07b5b8f6ab126b6bed5c" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#6940c4f1d4a2539f705960d7315e5f89a3bb8c97" dependencies = [ "backtrace", "bytes", @@ -1030,7 +1030,7 @@ dependencies = [ [[package]] name = "hc-wasmer-derive" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#c3bcc287d916fac852db07b5b8f6ab126b6bed5c" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#6940c4f1d4a2539f705960d7315e5f89a3bb8c97" dependencies = [ "proc-macro-error", "proc-macro2", @@ -1041,7 +1041,7 @@ dependencies = [ [[package]] name = "hc-wasmer-types" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#c3bcc287d916fac852db07b5b8f6ab126b6bed5c" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#6940c4f1d4a2539f705960d7315e5f89a3bb8c97" dependencies = [ "bytecheck", "enum-iterator", @@ -1060,7 +1060,7 @@ dependencies = [ [[package]] name = "hc-wasmer-vm" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#c3bcc287d916fac852db07b5b8f6ab126b6bed5c" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#6940c4f1d4a2539f705960d7315e5f89a3bb8c97" dependencies = [ "backtrace", "cc", From 0e76b8e365b835f215bc74a4a8c5625979cd6a21 Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 30 Aug 2024 16:37:35 -0700 Subject: [PATCH 29/62] build: bump cargo lock --- .github/workflows/test.yml | 10 +++++----- Cargo.lock | 10 +++++----- test/Cargo.lock | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index fd21d0b1..0f9e2e56 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -45,11 +45,11 @@ jobs: - uses: dtolnay/rust-toolchain@stable with: targets: wasm32-unknown-unknown - # - name: install gcc - # uses: MinoruSekine/setup-scoop@v4 - # with: - # bucket: versions - # apps: main/msys2 + - name: install mingw + uses: MinoruSekine/setup-scoop@v4 + with: + bucket: versions + apps: main/mingw - name: test root run: cargo test --release --no-default-features --features error_as_host,${{ matrix.wasmer-feature }} -- --nocapture - name: test diff --git a/Cargo.lock b/Cargo.lock index 7d6ff4d0..b3ac5cff 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -818,7 +818,7 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hc-wasmer" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#6940c4f1d4a2539f705960d7315e5f89a3bb8c97" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#391654fea89ca76ff25b5e5103f418932faa1fb8" dependencies = [ "bindgen", "bytes", @@ -850,7 +850,7 @@ dependencies = [ [[package]] name = "hc-wasmer-compiler" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#6940c4f1d4a2539f705960d7315e5f89a3bb8c97" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#391654fea89ca76ff25b5e5103f418932faa1fb8" dependencies = [ "backtrace", "bytes", @@ -877,7 +877,7 @@ dependencies = [ [[package]] name = "hc-wasmer-derive" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#6940c4f1d4a2539f705960d7315e5f89a3bb8c97" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#391654fea89ca76ff25b5e5103f418932faa1fb8" dependencies = [ "proc-macro-error", "proc-macro2", @@ -888,7 +888,7 @@ dependencies = [ [[package]] name = "hc-wasmer-types" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#6940c4f1d4a2539f705960d7315e5f89a3bb8c97" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#391654fea89ca76ff25b5e5103f418932faa1fb8" dependencies = [ "bytecheck", "enum-iterator", @@ -907,7 +907,7 @@ dependencies = [ [[package]] name = "hc-wasmer-vm" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#6940c4f1d4a2539f705960d7315e5f89a3bb8c97" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#391654fea89ca76ff25b5e5103f418932faa1fb8" dependencies = [ "backtrace", "cc", diff --git a/test/Cargo.lock b/test/Cargo.lock index 1f80fd1b..43890a02 100644 --- a/test/Cargo.lock +++ b/test/Cargo.lock @@ -971,7 +971,7 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hc-wasmer" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#6940c4f1d4a2539f705960d7315e5f89a3bb8c97" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#391654fea89ca76ff25b5e5103f418932faa1fb8" dependencies = [ "bindgen", "bytes", @@ -1003,7 +1003,7 @@ dependencies = [ [[package]] name = "hc-wasmer-compiler" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#6940c4f1d4a2539f705960d7315e5f89a3bb8c97" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#391654fea89ca76ff25b5e5103f418932faa1fb8" dependencies = [ "backtrace", "bytes", @@ -1030,7 +1030,7 @@ dependencies = [ [[package]] name = "hc-wasmer-derive" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#6940c4f1d4a2539f705960d7315e5f89a3bb8c97" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#391654fea89ca76ff25b5e5103f418932faa1fb8" dependencies = [ "proc-macro-error", "proc-macro2", @@ -1041,7 +1041,7 @@ dependencies = [ [[package]] name = "hc-wasmer-types" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#6940c4f1d4a2539f705960d7315e5f89a3bb8c97" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#391654fea89ca76ff25b5e5103f418932faa1fb8" dependencies = [ "bytecheck", "enum-iterator", @@ -1060,7 +1060,7 @@ dependencies = [ [[package]] name = "hc-wasmer-vm" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#6940c4f1d4a2539f705960d7315e5f89a3bb8c97" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#391654fea89ca76ff25b5e5103f418932faa1fb8" dependencies = [ "backtrace", "cc", From 5dac33187481c73046015d28a8b372fa0feabe44 Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 30 Aug 2024 16:57:16 -0700 Subject: [PATCH 30/62] build: bump cargo lock --- Cargo.lock | 10 +++++----- test/Cargo.lock | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b3ac5cff..cfb2c216 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -818,7 +818,7 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hc-wasmer" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#391654fea89ca76ff25b5e5103f418932faa1fb8" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#af37d2c378ff154d6aa708a78e1cd1d2613ca93b" dependencies = [ "bindgen", "bytes", @@ -850,7 +850,7 @@ dependencies = [ [[package]] name = "hc-wasmer-compiler" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#391654fea89ca76ff25b5e5103f418932faa1fb8" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#af37d2c378ff154d6aa708a78e1cd1d2613ca93b" dependencies = [ "backtrace", "bytes", @@ -877,7 +877,7 @@ dependencies = [ [[package]] name = "hc-wasmer-derive" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#391654fea89ca76ff25b5e5103f418932faa1fb8" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#af37d2c378ff154d6aa708a78e1cd1d2613ca93b" dependencies = [ "proc-macro-error", "proc-macro2", @@ -888,7 +888,7 @@ dependencies = [ [[package]] name = "hc-wasmer-types" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#391654fea89ca76ff25b5e5103f418932faa1fb8" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#af37d2c378ff154d6aa708a78e1cd1d2613ca93b" dependencies = [ "bytecheck", "enum-iterator", @@ -907,7 +907,7 @@ dependencies = [ [[package]] name = "hc-wasmer-vm" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#391654fea89ca76ff25b5e5103f418932faa1fb8" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#af37d2c378ff154d6aa708a78e1cd1d2613ca93b" dependencies = [ "backtrace", "cc", diff --git a/test/Cargo.lock b/test/Cargo.lock index 43890a02..15ff33a6 100644 --- a/test/Cargo.lock +++ b/test/Cargo.lock @@ -971,7 +971,7 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hc-wasmer" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#391654fea89ca76ff25b5e5103f418932faa1fb8" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#af37d2c378ff154d6aa708a78e1cd1d2613ca93b" dependencies = [ "bindgen", "bytes", @@ -1003,7 +1003,7 @@ dependencies = [ [[package]] name = "hc-wasmer-compiler" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#391654fea89ca76ff25b5e5103f418932faa1fb8" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#af37d2c378ff154d6aa708a78e1cd1d2613ca93b" dependencies = [ "backtrace", "bytes", @@ -1030,7 +1030,7 @@ dependencies = [ [[package]] name = "hc-wasmer-derive" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#391654fea89ca76ff25b5e5103f418932faa1fb8" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#af37d2c378ff154d6aa708a78e1cd1d2613ca93b" dependencies = [ "proc-macro-error", "proc-macro2", @@ -1041,7 +1041,7 @@ dependencies = [ [[package]] name = "hc-wasmer-types" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#391654fea89ca76ff25b5e5103f418932faa1fb8" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#af37d2c378ff154d6aa708a78e1cd1d2613ca93b" dependencies = [ "bytecheck", "enum-iterator", @@ -1060,7 +1060,7 @@ dependencies = [ [[package]] name = "hc-wasmer-vm" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#391654fea89ca76ff25b5e5103f418932faa1fb8" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#af37d2c378ff154d6aa708a78e1cd1d2613ca93b" dependencies = [ "backtrace", "cc", From 01cddc76241b203cd91d5f4a4d1457b23edf4ef3 Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 30 Aug 2024 17:16:31 -0700 Subject: [PATCH 31/62] build: bump cargo lock --- Cargo.lock | 13 ++++++------- test/Cargo.lock | 15 +++++++-------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cfb2c216..97fb71af 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -284,8 +284,7 @@ dependencies = [ [[package]] name = "cmake" version = "0.1.51" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb1e43aa7fd152b1f968787f7dbcdeb306d1867ff373c69955211876c053f91a" +source = "git+https://github.com/mattyg/cmake-rs?branch=fix/invalid-arg-mingw-generator#af4d756c898c986829499de748d9201a3739a0b7" dependencies = [ "cc", ] @@ -818,7 +817,7 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hc-wasmer" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#af37d2c378ff154d6aa708a78e1cd1d2613ca93b" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#ac306eab11ece3d791eea1df93936ea8649a445f" dependencies = [ "bindgen", "bytes", @@ -850,7 +849,7 @@ dependencies = [ [[package]] name = "hc-wasmer-compiler" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#af37d2c378ff154d6aa708a78e1cd1d2613ca93b" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#ac306eab11ece3d791eea1df93936ea8649a445f" dependencies = [ "backtrace", "bytes", @@ -877,7 +876,7 @@ dependencies = [ [[package]] name = "hc-wasmer-derive" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#af37d2c378ff154d6aa708a78e1cd1d2613ca93b" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#ac306eab11ece3d791eea1df93936ea8649a445f" dependencies = [ "proc-macro-error", "proc-macro2", @@ -888,7 +887,7 @@ dependencies = [ [[package]] name = "hc-wasmer-types" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#af37d2c378ff154d6aa708a78e1cd1d2613ca93b" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#ac306eab11ece3d791eea1df93936ea8649a445f" dependencies = [ "bytecheck", "enum-iterator", @@ -907,7 +906,7 @@ dependencies = [ [[package]] name = "hc-wasmer-vm" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#af37d2c378ff154d6aa708a78e1cd1d2613ca93b" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#ac306eab11ece3d791eea1df93936ea8649a445f" dependencies = [ "backtrace", "cc", diff --git a/test/Cargo.lock b/test/Cargo.lock index 15ff33a6..50cf51d6 100644 --- a/test/Cargo.lock +++ b/test/Cargo.lock @@ -361,9 +361,8 @@ checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "cmake" -version = "0.1.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" +version = "0.1.51" +source = "git+https://github.com/mattyg/cmake-rs?branch=fix/invalid-arg-mingw-generator#af4d756c898c986829499de748d9201a3739a0b7" dependencies = [ "cc", ] @@ -971,7 +970,7 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hc-wasmer" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#af37d2c378ff154d6aa708a78e1cd1d2613ca93b" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#ac306eab11ece3d791eea1df93936ea8649a445f" dependencies = [ "bindgen", "bytes", @@ -1003,7 +1002,7 @@ dependencies = [ [[package]] name = "hc-wasmer-compiler" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#af37d2c378ff154d6aa708a78e1cd1d2613ca93b" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#ac306eab11ece3d791eea1df93936ea8649a445f" dependencies = [ "backtrace", "bytes", @@ -1030,7 +1029,7 @@ dependencies = [ [[package]] name = "hc-wasmer-derive" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#af37d2c378ff154d6aa708a78e1cd1d2613ca93b" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#ac306eab11ece3d791eea1df93936ea8649a445f" dependencies = [ "proc-macro-error", "proc-macro2", @@ -1041,7 +1040,7 @@ dependencies = [ [[package]] name = "hc-wasmer-types" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#af37d2c378ff154d6aa708a78e1cd1d2613ca93b" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#ac306eab11ece3d791eea1df93936ea8649a445f" dependencies = [ "bytecheck", "enum-iterator", @@ -1060,7 +1059,7 @@ dependencies = [ [[package]] name = "hc-wasmer-vm" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#af37d2c378ff154d6aa708a78e1cd1d2613ca93b" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#ac306eab11ece3d791eea1df93936ea8649a445f" dependencies = [ "backtrace", "cc", From d8211d83ebcd90e18e37f693a7891acb85e516ca Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 30 Aug 2024 17:25:41 -0700 Subject: [PATCH 32/62] build: bump cargo lock --- .github/workflows/test.yml | 3 +-- Cargo.lock | 10 +++++----- test/Cargo.lock | 10 +++++----- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0f9e2e56..77c94a5d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -48,8 +48,7 @@ jobs: - name: install mingw uses: MinoruSekine/setup-scoop@v4 with: - bucket: versions - apps: main/mingw + apps: main/mingw main/gcc - name: test root run: cargo test --release --no-default-features --features error_as_host,${{ matrix.wasmer-feature }} -- --nocapture - name: test diff --git a/Cargo.lock b/Cargo.lock index 97fb71af..f90b09ee 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -817,7 +817,7 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hc-wasmer" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#ac306eab11ece3d791eea1df93936ea8649a445f" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#4827ec6087c9eee3b9f9d9ec5885e03801a63579" dependencies = [ "bindgen", "bytes", @@ -849,7 +849,7 @@ dependencies = [ [[package]] name = "hc-wasmer-compiler" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#ac306eab11ece3d791eea1df93936ea8649a445f" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#4827ec6087c9eee3b9f9d9ec5885e03801a63579" dependencies = [ "backtrace", "bytes", @@ -876,7 +876,7 @@ dependencies = [ [[package]] name = "hc-wasmer-derive" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#ac306eab11ece3d791eea1df93936ea8649a445f" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#4827ec6087c9eee3b9f9d9ec5885e03801a63579" dependencies = [ "proc-macro-error", "proc-macro2", @@ -887,7 +887,7 @@ dependencies = [ [[package]] name = "hc-wasmer-types" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#ac306eab11ece3d791eea1df93936ea8649a445f" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#4827ec6087c9eee3b9f9d9ec5885e03801a63579" dependencies = [ "bytecheck", "enum-iterator", @@ -906,7 +906,7 @@ dependencies = [ [[package]] name = "hc-wasmer-vm" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#ac306eab11ece3d791eea1df93936ea8649a445f" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#4827ec6087c9eee3b9f9d9ec5885e03801a63579" dependencies = [ "backtrace", "cc", diff --git a/test/Cargo.lock b/test/Cargo.lock index 50cf51d6..2d7a981c 100644 --- a/test/Cargo.lock +++ b/test/Cargo.lock @@ -970,7 +970,7 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hc-wasmer" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#ac306eab11ece3d791eea1df93936ea8649a445f" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#4827ec6087c9eee3b9f9d9ec5885e03801a63579" dependencies = [ "bindgen", "bytes", @@ -1002,7 +1002,7 @@ dependencies = [ [[package]] name = "hc-wasmer-compiler" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#ac306eab11ece3d791eea1df93936ea8649a445f" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#4827ec6087c9eee3b9f9d9ec5885e03801a63579" dependencies = [ "backtrace", "bytes", @@ -1029,7 +1029,7 @@ dependencies = [ [[package]] name = "hc-wasmer-derive" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#ac306eab11ece3d791eea1df93936ea8649a445f" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#4827ec6087c9eee3b9f9d9ec5885e03801a63579" dependencies = [ "proc-macro-error", "proc-macro2", @@ -1040,7 +1040,7 @@ dependencies = [ [[package]] name = "hc-wasmer-types" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#ac306eab11ece3d791eea1df93936ea8649a445f" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#4827ec6087c9eee3b9f9d9ec5885e03801a63579" dependencies = [ "bytecheck", "enum-iterator", @@ -1059,7 +1059,7 @@ dependencies = [ [[package]] name = "hc-wasmer-vm" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#ac306eab11ece3d791eea1df93936ea8649a445f" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#4827ec6087c9eee3b9f9d9ec5885e03801a63579" dependencies = [ "backtrace", "cc", From 4b4700584a384beb8573628f5c2bc5eb7539fb9c Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 30 Aug 2024 17:35:13 -0700 Subject: [PATCH 33/62] wip --- .github/workflows/test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 77c94a5d..0e6a201b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -48,7 +48,8 @@ jobs: - name: install mingw uses: MinoruSekine/setup-scoop@v4 with: - apps: main/mingw main/gcc + buckets: versions + apps: versions/mingw-winlibs-llvm - name: test root run: cargo test --release --no-default-features --features error_as_host,${{ matrix.wasmer-feature }} -- --nocapture - name: test From 376dcf8d691c2c2ae43589df3da9a85c87d27227 Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 30 Aug 2024 17:37:58 -0700 Subject: [PATCH 34/62] wip --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0e6a201b..e9cea759 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -49,7 +49,7 @@ jobs: uses: MinoruSekine/setup-scoop@v4 with: buckets: versions - apps: versions/mingw-winlibs-llvm + apps: "versions/mingw-winlibs-llvm" - name: test root run: cargo test --release --no-default-features --features error_as_host,${{ matrix.wasmer-feature }} -- --nocapture - name: test From 335e9948c08cece9ddc77bfd1d364910848a9e40 Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 30 Aug 2024 17:47:34 -0700 Subject: [PATCH 35/62] fix: setup-scoop fork to allow app names with dashes --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e9cea759..e2378cdf 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -46,7 +46,7 @@ jobs: with: targets: wasm32-unknown-unknown - name: install mingw - uses: MinoruSekine/setup-scoop@v4 + uses: mattyg/setup-scoop@7b8f657bc28ef6faa8a8ecfca6fa4095ca583aa3 with: buckets: versions apps: "versions/mingw-winlibs-llvm" From 78d3b9cf9d17b3f844363f358644d0fc95e8e63e Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 30 Aug 2024 18:00:52 -0700 Subject: [PATCH 36/62] fix: delete command processor autorun reg entry --- .github/workflows/test.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e2378cdf..c5cf2904 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -50,6 +50,10 @@ jobs: with: buckets: versions apps: "versions/mingw-winlibs-llvm" + - name: delete registry entries + run: | + reg delete "HKEY_CURRENT_USER\Software\Microsoft\Command Processor\AutoRun" /f + reg delete "HKEY_LOCAL_MACHINE\Software\Microsoft\Command Processor\AutoRun" / - name: test root run: cargo test --release --no-default-features --features error_as_host,${{ matrix.wasmer-feature }} -- --nocapture - name: test From fa80b8998e1d91a519b72405102f83ed0e431bc3 Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 30 Aug 2024 18:13:23 -0700 Subject: [PATCH 37/62] fix: syntax --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c5cf2904..6847e002 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -53,7 +53,7 @@ jobs: - name: delete registry entries run: | reg delete "HKEY_CURRENT_USER\Software\Microsoft\Command Processor\AutoRun" /f - reg delete "HKEY_LOCAL_MACHINE\Software\Microsoft\Command Processor\AutoRun" / + reg delete "HKEY_LOCAL_MACHINE\Software\Microsoft\Command Processor\AutoRun" /f - name: test root run: cargo test --release --no-default-features --features error_as_host,${{ matrix.wasmer-feature }} -- --nocapture - name: test From 30b4b3f0ec37ca6ea246f0ebfdbdab12d51ddc1d Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 30 Aug 2024 18:23:47 -0700 Subject: [PATCH 38/62] wip --- .github/workflows/test.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6847e002..b5eb69dc 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -48,8 +48,7 @@ jobs: - name: install mingw uses: mattyg/setup-scoop@7b8f657bc28ef6faa8a8ecfca6fa4095ca583aa3 with: - buckets: versions - apps: "versions/mingw-winlibs-llvm" + apps: main/mingw - name: delete registry entries run: | reg delete "HKEY_CURRENT_USER\Software\Microsoft\Command Processor\AutoRun" /f From 5aea0ba496d94290bacd99a08c234579835bffc0 Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 30 Aug 2024 18:25:14 -0700 Subject: [PATCH 39/62] wip --- .github/workflows/test.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b5eb69dc..bec19749 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -49,10 +49,6 @@ jobs: uses: mattyg/setup-scoop@7b8f657bc28ef6faa8a8ecfca6fa4095ca583aa3 with: apps: main/mingw - - name: delete registry entries - run: | - reg delete "HKEY_CURRENT_USER\Software\Microsoft\Command Processor\AutoRun" /f - reg delete "HKEY_LOCAL_MACHINE\Software\Microsoft\Command Processor\AutoRun" /f - name: test root run: cargo test --release --no-default-features --features error_as_host,${{ matrix.wasmer-feature }} -- --nocapture - name: test From 7d52f174395523f49447ed784aea920f68f47449 Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 30 Aug 2024 18:39:27 -0700 Subject: [PATCH 40/62] wip --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bec19749..f263f1e1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -48,7 +48,7 @@ jobs: - name: install mingw uses: mattyg/setup-scoop@7b8f657bc28ef6faa8a8ecfca6fa4095ca583aa3 with: - apps: main/mingw + apps: main/msys2 - name: test root run: cargo test --release --no-default-features --features error_as_host,${{ matrix.wasmer-feature }} -- --nocapture - name: test From 90735f5a7a0635e65a0afdf48adfa8e08f7cd677 Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 30 Aug 2024 18:45:54 -0700 Subject: [PATCH 41/62] wip --- Cargo.lock | 10 +++++----- test/Cargo.lock | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f90b09ee..38734e16 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -817,7 +817,7 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hc-wasmer" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#4827ec6087c9eee3b9f9d9ec5885e03801a63579" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#53d1ecb22a68662f2ee4352ac54084b60c17c0d1" dependencies = [ "bindgen", "bytes", @@ -849,7 +849,7 @@ dependencies = [ [[package]] name = "hc-wasmer-compiler" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#4827ec6087c9eee3b9f9d9ec5885e03801a63579" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#53d1ecb22a68662f2ee4352ac54084b60c17c0d1" dependencies = [ "backtrace", "bytes", @@ -876,7 +876,7 @@ dependencies = [ [[package]] name = "hc-wasmer-derive" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#4827ec6087c9eee3b9f9d9ec5885e03801a63579" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#53d1ecb22a68662f2ee4352ac54084b60c17c0d1" dependencies = [ "proc-macro-error", "proc-macro2", @@ -887,7 +887,7 @@ dependencies = [ [[package]] name = "hc-wasmer-types" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#4827ec6087c9eee3b9f9d9ec5885e03801a63579" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#53d1ecb22a68662f2ee4352ac54084b60c17c0d1" dependencies = [ "bytecheck", "enum-iterator", @@ -906,7 +906,7 @@ dependencies = [ [[package]] name = "hc-wasmer-vm" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#4827ec6087c9eee3b9f9d9ec5885e03801a63579" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#53d1ecb22a68662f2ee4352ac54084b60c17c0d1" dependencies = [ "backtrace", "cc", diff --git a/test/Cargo.lock b/test/Cargo.lock index 2d7a981c..6075cef3 100644 --- a/test/Cargo.lock +++ b/test/Cargo.lock @@ -970,7 +970,7 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hc-wasmer" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#4827ec6087c9eee3b9f9d9ec5885e03801a63579" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#53d1ecb22a68662f2ee4352ac54084b60c17c0d1" dependencies = [ "bindgen", "bytes", @@ -1002,7 +1002,7 @@ dependencies = [ [[package]] name = "hc-wasmer-compiler" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#4827ec6087c9eee3b9f9d9ec5885e03801a63579" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#53d1ecb22a68662f2ee4352ac54084b60c17c0d1" dependencies = [ "backtrace", "bytes", @@ -1029,7 +1029,7 @@ dependencies = [ [[package]] name = "hc-wasmer-derive" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#4827ec6087c9eee3b9f9d9ec5885e03801a63579" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#53d1ecb22a68662f2ee4352ac54084b60c17c0d1" dependencies = [ "proc-macro-error", "proc-macro2", @@ -1040,7 +1040,7 @@ dependencies = [ [[package]] name = "hc-wasmer-types" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#4827ec6087c9eee3b9f9d9ec5885e03801a63579" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#53d1ecb22a68662f2ee4352ac54084b60c17c0d1" dependencies = [ "bytecheck", "enum-iterator", @@ -1059,7 +1059,7 @@ dependencies = [ [[package]] name = "hc-wasmer-vm" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#4827ec6087c9eee3b9f9d9ec5885e03801a63579" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#53d1ecb22a68662f2ee4352ac54084b60c17c0d1" dependencies = [ "backtrace", "cc", From 3bf4dbe62346f82a6644761bdfeead5573300835 Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 30 Aug 2024 18:58:52 -0700 Subject: [PATCH 42/62] wip --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f263f1e1..bec19749 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -48,7 +48,7 @@ jobs: - name: install mingw uses: mattyg/setup-scoop@7b8f657bc28ef6faa8a8ecfca6fa4095ca583aa3 with: - apps: main/msys2 + apps: main/mingw - name: test root run: cargo test --release --no-default-features --features error_as_host,${{ matrix.wasmer-feature }} -- --nocapture - name: test From 85eacf3efd08237071ebc449b8bb78973946e8a5 Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 30 Aug 2024 19:23:55 -0700 Subject: [PATCH 43/62] wip --- Cargo.lock | 10 +++++----- test/Cargo.lock | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 38734e16..18a5869e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -817,7 +817,7 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hc-wasmer" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#53d1ecb22a68662f2ee4352ac54084b60c17c0d1" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#90f589965f75e7df39c352d52cb82895d046fb86" dependencies = [ "bindgen", "bytes", @@ -849,7 +849,7 @@ dependencies = [ [[package]] name = "hc-wasmer-compiler" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#53d1ecb22a68662f2ee4352ac54084b60c17c0d1" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#90f589965f75e7df39c352d52cb82895d046fb86" dependencies = [ "backtrace", "bytes", @@ -876,7 +876,7 @@ dependencies = [ [[package]] name = "hc-wasmer-derive" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#53d1ecb22a68662f2ee4352ac54084b60c17c0d1" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#90f589965f75e7df39c352d52cb82895d046fb86" dependencies = [ "proc-macro-error", "proc-macro2", @@ -887,7 +887,7 @@ dependencies = [ [[package]] name = "hc-wasmer-types" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#53d1ecb22a68662f2ee4352ac54084b60c17c0d1" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#90f589965f75e7df39c352d52cb82895d046fb86" dependencies = [ "bytecheck", "enum-iterator", @@ -906,7 +906,7 @@ dependencies = [ [[package]] name = "hc-wasmer-vm" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#53d1ecb22a68662f2ee4352ac54084b60c17c0d1" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#90f589965f75e7df39c352d52cb82895d046fb86" dependencies = [ "backtrace", "cc", diff --git a/test/Cargo.lock b/test/Cargo.lock index 6075cef3..81fc6362 100644 --- a/test/Cargo.lock +++ b/test/Cargo.lock @@ -970,7 +970,7 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hc-wasmer" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#53d1ecb22a68662f2ee4352ac54084b60c17c0d1" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#90f589965f75e7df39c352d52cb82895d046fb86" dependencies = [ "bindgen", "bytes", @@ -1002,7 +1002,7 @@ dependencies = [ [[package]] name = "hc-wasmer-compiler" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#53d1ecb22a68662f2ee4352ac54084b60c17c0d1" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#90f589965f75e7df39c352d52cb82895d046fb86" dependencies = [ "backtrace", "bytes", @@ -1029,7 +1029,7 @@ dependencies = [ [[package]] name = "hc-wasmer-derive" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#53d1ecb22a68662f2ee4352ac54084b60c17c0d1" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#90f589965f75e7df39c352d52cb82895d046fb86" dependencies = [ "proc-macro-error", "proc-macro2", @@ -1040,7 +1040,7 @@ dependencies = [ [[package]] name = "hc-wasmer-types" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#53d1ecb22a68662f2ee4352ac54084b60c17c0d1" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#90f589965f75e7df39c352d52cb82895d046fb86" dependencies = [ "bytecheck", "enum-iterator", @@ -1059,7 +1059,7 @@ dependencies = [ [[package]] name = "hc-wasmer-vm" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#53d1ecb22a68662f2ee4352ac54084b60c17c0d1" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#90f589965f75e7df39c352d52cb82895d046fb86" dependencies = [ "backtrace", "cc", From cdba5b5ff8a7de7db150bedbf4576397eb93ec4f Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 30 Aug 2024 19:38:37 -0700 Subject: [PATCH 44/62] wip --- Cargo.lock | 10 +++++----- test/Cargo.lock | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 18a5869e..6230baaa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -817,7 +817,7 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hc-wasmer" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#90f589965f75e7df39c352d52cb82895d046fb86" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#1839bab7053a2d0161b7e683b55773b701d3565a" dependencies = [ "bindgen", "bytes", @@ -849,7 +849,7 @@ dependencies = [ [[package]] name = "hc-wasmer-compiler" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#90f589965f75e7df39c352d52cb82895d046fb86" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#1839bab7053a2d0161b7e683b55773b701d3565a" dependencies = [ "backtrace", "bytes", @@ -876,7 +876,7 @@ dependencies = [ [[package]] name = "hc-wasmer-derive" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#90f589965f75e7df39c352d52cb82895d046fb86" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#1839bab7053a2d0161b7e683b55773b701d3565a" dependencies = [ "proc-macro-error", "proc-macro2", @@ -887,7 +887,7 @@ dependencies = [ [[package]] name = "hc-wasmer-types" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#90f589965f75e7df39c352d52cb82895d046fb86" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#1839bab7053a2d0161b7e683b55773b701d3565a" dependencies = [ "bytecheck", "enum-iterator", @@ -906,7 +906,7 @@ dependencies = [ [[package]] name = "hc-wasmer-vm" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#90f589965f75e7df39c352d52cb82895d046fb86" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#1839bab7053a2d0161b7e683b55773b701d3565a" dependencies = [ "backtrace", "cc", diff --git a/test/Cargo.lock b/test/Cargo.lock index 81fc6362..59bccc9d 100644 --- a/test/Cargo.lock +++ b/test/Cargo.lock @@ -970,7 +970,7 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hc-wasmer" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#90f589965f75e7df39c352d52cb82895d046fb86" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#1839bab7053a2d0161b7e683b55773b701d3565a" dependencies = [ "bindgen", "bytes", @@ -1002,7 +1002,7 @@ dependencies = [ [[package]] name = "hc-wasmer-compiler" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#90f589965f75e7df39c352d52cb82895d046fb86" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#1839bab7053a2d0161b7e683b55773b701d3565a" dependencies = [ "backtrace", "bytes", @@ -1029,7 +1029,7 @@ dependencies = [ [[package]] name = "hc-wasmer-derive" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#90f589965f75e7df39c352d52cb82895d046fb86" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#1839bab7053a2d0161b7e683b55773b701d3565a" dependencies = [ "proc-macro-error", "proc-macro2", @@ -1040,7 +1040,7 @@ dependencies = [ [[package]] name = "hc-wasmer-types" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#90f589965f75e7df39c352d52cb82895d046fb86" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#1839bab7053a2d0161b7e683b55773b701d3565a" dependencies = [ "bytecheck", "enum-iterator", @@ -1059,7 +1059,7 @@ dependencies = [ [[package]] name = "hc-wasmer-vm" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#90f589965f75e7df39c352d52cb82895d046fb86" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#1839bab7053a2d0161b7e683b55773b701d3565a" dependencies = [ "backtrace", "cc", From 03d570f5fac0e199bfc90ab0f4839340b4933dbf Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 30 Aug 2024 19:53:44 -0700 Subject: [PATCH 45/62] wip --- Cargo.lock | 10 +++++----- test/Cargo.lock | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6230baaa..6f6c208c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -817,7 +817,7 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hc-wasmer" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#1839bab7053a2d0161b7e683b55773b701d3565a" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#621fe7f68fea0dfe17f6f438b9f97c3191abb64f" dependencies = [ "bindgen", "bytes", @@ -849,7 +849,7 @@ dependencies = [ [[package]] name = "hc-wasmer-compiler" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#1839bab7053a2d0161b7e683b55773b701d3565a" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#621fe7f68fea0dfe17f6f438b9f97c3191abb64f" dependencies = [ "backtrace", "bytes", @@ -876,7 +876,7 @@ dependencies = [ [[package]] name = "hc-wasmer-derive" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#1839bab7053a2d0161b7e683b55773b701d3565a" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#621fe7f68fea0dfe17f6f438b9f97c3191abb64f" dependencies = [ "proc-macro-error", "proc-macro2", @@ -887,7 +887,7 @@ dependencies = [ [[package]] name = "hc-wasmer-types" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#1839bab7053a2d0161b7e683b55773b701d3565a" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#621fe7f68fea0dfe17f6f438b9f97c3191abb64f" dependencies = [ "bytecheck", "enum-iterator", @@ -906,7 +906,7 @@ dependencies = [ [[package]] name = "hc-wasmer-vm" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#1839bab7053a2d0161b7e683b55773b701d3565a" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#621fe7f68fea0dfe17f6f438b9f97c3191abb64f" dependencies = [ "backtrace", "cc", diff --git a/test/Cargo.lock b/test/Cargo.lock index 59bccc9d..142c2314 100644 --- a/test/Cargo.lock +++ b/test/Cargo.lock @@ -970,7 +970,7 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hc-wasmer" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#1839bab7053a2d0161b7e683b55773b701d3565a" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#621fe7f68fea0dfe17f6f438b9f97c3191abb64f" dependencies = [ "bindgen", "bytes", @@ -1002,7 +1002,7 @@ dependencies = [ [[package]] name = "hc-wasmer-compiler" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#1839bab7053a2d0161b7e683b55773b701d3565a" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#621fe7f68fea0dfe17f6f438b9f97c3191abb64f" dependencies = [ "backtrace", "bytes", @@ -1029,7 +1029,7 @@ dependencies = [ [[package]] name = "hc-wasmer-derive" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#1839bab7053a2d0161b7e683b55773b701d3565a" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#621fe7f68fea0dfe17f6f438b9f97c3191abb64f" dependencies = [ "proc-macro-error", "proc-macro2", @@ -1040,7 +1040,7 @@ dependencies = [ [[package]] name = "hc-wasmer-types" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#1839bab7053a2d0161b7e683b55773b701d3565a" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#621fe7f68fea0dfe17f6f438b9f97c3191abb64f" dependencies = [ "bytecheck", "enum-iterator", @@ -1059,7 +1059,7 @@ dependencies = [ [[package]] name = "hc-wasmer-vm" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#1839bab7053a2d0161b7e683b55773b701d3565a" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#621fe7f68fea0dfe17f6f438b9f97c3191abb64f" dependencies = [ "backtrace", "cc", From 9204bfe13c706341b0c4ffe4f893454291f4bff7 Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 30 Aug 2024 20:20:56 -0700 Subject: [PATCH 46/62] wip --- Cargo.lock | 10 +++++----- test/Cargo.lock | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6f6c208c..77fabdf3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -817,7 +817,7 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hc-wasmer" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#621fe7f68fea0dfe17f6f438b9f97c3191abb64f" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#82b291f9765209b19964d8442d222e9343732661" dependencies = [ "bindgen", "bytes", @@ -849,7 +849,7 @@ dependencies = [ [[package]] name = "hc-wasmer-compiler" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#621fe7f68fea0dfe17f6f438b9f97c3191abb64f" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#82b291f9765209b19964d8442d222e9343732661" dependencies = [ "backtrace", "bytes", @@ -876,7 +876,7 @@ dependencies = [ [[package]] name = "hc-wasmer-derive" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#621fe7f68fea0dfe17f6f438b9f97c3191abb64f" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#82b291f9765209b19964d8442d222e9343732661" dependencies = [ "proc-macro-error", "proc-macro2", @@ -887,7 +887,7 @@ dependencies = [ [[package]] name = "hc-wasmer-types" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#621fe7f68fea0dfe17f6f438b9f97c3191abb64f" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#82b291f9765209b19964d8442d222e9343732661" dependencies = [ "bytecheck", "enum-iterator", @@ -906,7 +906,7 @@ dependencies = [ [[package]] name = "hc-wasmer-vm" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#621fe7f68fea0dfe17f6f438b9f97c3191abb64f" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#82b291f9765209b19964d8442d222e9343732661" dependencies = [ "backtrace", "cc", diff --git a/test/Cargo.lock b/test/Cargo.lock index 142c2314..70d5fd12 100644 --- a/test/Cargo.lock +++ b/test/Cargo.lock @@ -970,7 +970,7 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hc-wasmer" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#621fe7f68fea0dfe17f6f438b9f97c3191abb64f" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#82b291f9765209b19964d8442d222e9343732661" dependencies = [ "bindgen", "bytes", @@ -1002,7 +1002,7 @@ dependencies = [ [[package]] name = "hc-wasmer-compiler" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#621fe7f68fea0dfe17f6f438b9f97c3191abb64f" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#82b291f9765209b19964d8442d222e9343732661" dependencies = [ "backtrace", "bytes", @@ -1029,7 +1029,7 @@ dependencies = [ [[package]] name = "hc-wasmer-derive" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#621fe7f68fea0dfe17f6f438b9f97c3191abb64f" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#82b291f9765209b19964d8442d222e9343732661" dependencies = [ "proc-macro-error", "proc-macro2", @@ -1040,7 +1040,7 @@ dependencies = [ [[package]] name = "hc-wasmer-types" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#621fe7f68fea0dfe17f6f438b9f97c3191abb64f" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#82b291f9765209b19964d8442d222e9343732661" dependencies = [ "bytecheck", "enum-iterator", @@ -1059,7 +1059,7 @@ dependencies = [ [[package]] name = "hc-wasmer-vm" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#621fe7f68fea0dfe17f6f438b9f97c3191abb64f" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#82b291f9765209b19964d8442d222e9343732661" dependencies = [ "backtrace", "cc", From 47cdd4f41c69c96abe80f8f894955e37a2406339 Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 30 Aug 2024 20:38:01 -0700 Subject: [PATCH 47/62] wip --- Cargo.lock | 10 +++++----- test/Cargo.lock | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 77fabdf3..70edfa3e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -817,7 +817,7 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hc-wasmer" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#82b291f9765209b19964d8442d222e9343732661" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#ba4ec5f393dbbc03c75bdec378e1bd25279ab2ab" dependencies = [ "bindgen", "bytes", @@ -849,7 +849,7 @@ dependencies = [ [[package]] name = "hc-wasmer-compiler" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#82b291f9765209b19964d8442d222e9343732661" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#ba4ec5f393dbbc03c75bdec378e1bd25279ab2ab" dependencies = [ "backtrace", "bytes", @@ -876,7 +876,7 @@ dependencies = [ [[package]] name = "hc-wasmer-derive" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#82b291f9765209b19964d8442d222e9343732661" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#ba4ec5f393dbbc03c75bdec378e1bd25279ab2ab" dependencies = [ "proc-macro-error", "proc-macro2", @@ -887,7 +887,7 @@ dependencies = [ [[package]] name = "hc-wasmer-types" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#82b291f9765209b19964d8442d222e9343732661" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#ba4ec5f393dbbc03c75bdec378e1bd25279ab2ab" dependencies = [ "bytecheck", "enum-iterator", @@ -906,7 +906,7 @@ dependencies = [ [[package]] name = "hc-wasmer-vm" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#82b291f9765209b19964d8442d222e9343732661" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#ba4ec5f393dbbc03c75bdec378e1bd25279ab2ab" dependencies = [ "backtrace", "cc", diff --git a/test/Cargo.lock b/test/Cargo.lock index 70d5fd12..8c76a484 100644 --- a/test/Cargo.lock +++ b/test/Cargo.lock @@ -970,7 +970,7 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hc-wasmer" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#82b291f9765209b19964d8442d222e9343732661" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#ba4ec5f393dbbc03c75bdec378e1bd25279ab2ab" dependencies = [ "bindgen", "bytes", @@ -1002,7 +1002,7 @@ dependencies = [ [[package]] name = "hc-wasmer-compiler" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#82b291f9765209b19964d8442d222e9343732661" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#ba4ec5f393dbbc03c75bdec378e1bd25279ab2ab" dependencies = [ "backtrace", "bytes", @@ -1029,7 +1029,7 @@ dependencies = [ [[package]] name = "hc-wasmer-derive" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#82b291f9765209b19964d8442d222e9343732661" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#ba4ec5f393dbbc03c75bdec378e1bd25279ab2ab" dependencies = [ "proc-macro-error", "proc-macro2", @@ -1040,7 +1040,7 @@ dependencies = [ [[package]] name = "hc-wasmer-types" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#82b291f9765209b19964d8442d222e9343732661" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#ba4ec5f393dbbc03c75bdec378e1bd25279ab2ab" dependencies = [ "bytecheck", "enum-iterator", @@ -1059,7 +1059,7 @@ dependencies = [ [[package]] name = "hc-wasmer-vm" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#82b291f9765209b19964d8442d222e9343732661" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#ba4ec5f393dbbc03c75bdec378e1bd25279ab2ab" dependencies = [ "backtrace", "cc", From 9094d37363cae4f3807e5e0a933da8714e04a6da Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 30 Aug 2024 20:45:17 -0700 Subject: [PATCH 48/62] wip --- Cargo.lock | 10 +++++----- test/Cargo.lock | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 70edfa3e..299cb3b7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -817,7 +817,7 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hc-wasmer" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#ba4ec5f393dbbc03c75bdec378e1bd25279ab2ab" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#973e6cc40a61e3809fed1e7187e415acea5807ce" dependencies = [ "bindgen", "bytes", @@ -849,7 +849,7 @@ dependencies = [ [[package]] name = "hc-wasmer-compiler" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#ba4ec5f393dbbc03c75bdec378e1bd25279ab2ab" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#973e6cc40a61e3809fed1e7187e415acea5807ce" dependencies = [ "backtrace", "bytes", @@ -876,7 +876,7 @@ dependencies = [ [[package]] name = "hc-wasmer-derive" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#ba4ec5f393dbbc03c75bdec378e1bd25279ab2ab" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#973e6cc40a61e3809fed1e7187e415acea5807ce" dependencies = [ "proc-macro-error", "proc-macro2", @@ -887,7 +887,7 @@ dependencies = [ [[package]] name = "hc-wasmer-types" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#ba4ec5f393dbbc03c75bdec378e1bd25279ab2ab" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#973e6cc40a61e3809fed1e7187e415acea5807ce" dependencies = [ "bytecheck", "enum-iterator", @@ -906,7 +906,7 @@ dependencies = [ [[package]] name = "hc-wasmer-vm" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#ba4ec5f393dbbc03c75bdec378e1bd25279ab2ab" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#973e6cc40a61e3809fed1e7187e415acea5807ce" dependencies = [ "backtrace", "cc", diff --git a/test/Cargo.lock b/test/Cargo.lock index 8c76a484..d0449ced 100644 --- a/test/Cargo.lock +++ b/test/Cargo.lock @@ -970,7 +970,7 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hc-wasmer" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#ba4ec5f393dbbc03c75bdec378e1bd25279ab2ab" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#973e6cc40a61e3809fed1e7187e415acea5807ce" dependencies = [ "bindgen", "bytes", @@ -1002,7 +1002,7 @@ dependencies = [ [[package]] name = "hc-wasmer-compiler" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#ba4ec5f393dbbc03c75bdec378e1bd25279ab2ab" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#973e6cc40a61e3809fed1e7187e415acea5807ce" dependencies = [ "backtrace", "bytes", @@ -1029,7 +1029,7 @@ dependencies = [ [[package]] name = "hc-wasmer-derive" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#ba4ec5f393dbbc03c75bdec378e1bd25279ab2ab" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#973e6cc40a61e3809fed1e7187e415acea5807ce" dependencies = [ "proc-macro-error", "proc-macro2", @@ -1040,7 +1040,7 @@ dependencies = [ [[package]] name = "hc-wasmer-types" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#ba4ec5f393dbbc03c75bdec378e1bd25279ab2ab" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#973e6cc40a61e3809fed1e7187e415acea5807ce" dependencies = [ "bytecheck", "enum-iterator", @@ -1059,7 +1059,7 @@ dependencies = [ [[package]] name = "hc-wasmer-vm" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#ba4ec5f393dbbc03c75bdec378e1bd25279ab2ab" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#973e6cc40a61e3809fed1e7187e415acea5807ce" dependencies = [ "backtrace", "cc", From a8af8f99271edcf94719455dc58e7b6ff6c68486 Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 30 Aug 2024 21:01:44 -0700 Subject: [PATCH 49/62] wip: try ucrt --- .github/workflows/test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bec19749..eccd5e23 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -48,7 +48,8 @@ jobs: - name: install mingw uses: mattyg/setup-scoop@7b8f657bc28ef6faa8a8ecfca6fa4095ca583aa3 with: - apps: main/mingw + buckets: versions + apps: versions/mingw-winlibs-llvm-ucrt - name: test root run: cargo test --release --no-default-features --features error_as_host,${{ matrix.wasmer-feature }} -- --nocapture - name: test From 6dfcc865f021e081342e601354c81579da921877 Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 30 Aug 2024 21:21:08 -0700 Subject: [PATCH 50/62] wip --- Cargo.lock | 10 +++++----- test/Cargo.lock | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 299cb3b7..5a000c9b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -817,7 +817,7 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hc-wasmer" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#973e6cc40a61e3809fed1e7187e415acea5807ce" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#eaaebdbce520d642ee371ecf3cc18679f6847cd3" dependencies = [ "bindgen", "bytes", @@ -849,7 +849,7 @@ dependencies = [ [[package]] name = "hc-wasmer-compiler" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#973e6cc40a61e3809fed1e7187e415acea5807ce" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#eaaebdbce520d642ee371ecf3cc18679f6847cd3" dependencies = [ "backtrace", "bytes", @@ -876,7 +876,7 @@ dependencies = [ [[package]] name = "hc-wasmer-derive" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#973e6cc40a61e3809fed1e7187e415acea5807ce" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#eaaebdbce520d642ee371ecf3cc18679f6847cd3" dependencies = [ "proc-macro-error", "proc-macro2", @@ -887,7 +887,7 @@ dependencies = [ [[package]] name = "hc-wasmer-types" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#973e6cc40a61e3809fed1e7187e415acea5807ce" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#eaaebdbce520d642ee371ecf3cc18679f6847cd3" dependencies = [ "bytecheck", "enum-iterator", @@ -906,7 +906,7 @@ dependencies = [ [[package]] name = "hc-wasmer-vm" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#973e6cc40a61e3809fed1e7187e415acea5807ce" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#eaaebdbce520d642ee371ecf3cc18679f6847cd3" dependencies = [ "backtrace", "cc", diff --git a/test/Cargo.lock b/test/Cargo.lock index d0449ced..35ffe8d9 100644 --- a/test/Cargo.lock +++ b/test/Cargo.lock @@ -970,7 +970,7 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hc-wasmer" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#973e6cc40a61e3809fed1e7187e415acea5807ce" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#eaaebdbce520d642ee371ecf3cc18679f6847cd3" dependencies = [ "bindgen", "bytes", @@ -1002,7 +1002,7 @@ dependencies = [ [[package]] name = "hc-wasmer-compiler" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#973e6cc40a61e3809fed1e7187e415acea5807ce" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#eaaebdbce520d642ee371ecf3cc18679f6847cd3" dependencies = [ "backtrace", "bytes", @@ -1029,7 +1029,7 @@ dependencies = [ [[package]] name = "hc-wasmer-derive" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#973e6cc40a61e3809fed1e7187e415acea5807ce" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#eaaebdbce520d642ee371ecf3cc18679f6847cd3" dependencies = [ "proc-macro-error", "proc-macro2", @@ -1040,7 +1040,7 @@ dependencies = [ [[package]] name = "hc-wasmer-types" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#973e6cc40a61e3809fed1e7187e415acea5807ce" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#eaaebdbce520d642ee371ecf3cc18679f6847cd3" dependencies = [ "bytecheck", "enum-iterator", @@ -1059,7 +1059,7 @@ dependencies = [ [[package]] name = "hc-wasmer-vm" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#973e6cc40a61e3809fed1e7187e415acea5807ce" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#eaaebdbce520d642ee371ecf3cc18679f6847cd3" dependencies = [ "backtrace", "cc", From 73e1aba0ae58c9ce5a60be193a4f6aeef44cec61 Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 30 Aug 2024 21:30:28 -0700 Subject: [PATCH 51/62] wip --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index eccd5e23..e19f0c87 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -49,7 +49,7 @@ jobs: uses: mattyg/setup-scoop@7b8f657bc28ef6faa8a8ecfca6fa4095ca583aa3 with: buckets: versions - apps: versions/mingw-winlibs-llvm-ucrt + apps: versions/msys2 - name: test root run: cargo test --release --no-default-features --features error_as_host,${{ matrix.wasmer-feature }} -- --nocapture - name: test From aa460520bf19770717c2fd17dae5292e06f6d325 Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Sat, 31 Aug 2024 15:36:00 -0700 Subject: [PATCH 52/62] wip --- Cargo.lock | 10 +++++----- test/Cargo.lock | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5a000c9b..ad5c9100 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -817,7 +817,7 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hc-wasmer" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#eaaebdbce520d642ee371ecf3cc18679f6847cd3" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#10722a12380a67949b6a8673fdfcd16810745526" dependencies = [ "bindgen", "bytes", @@ -849,7 +849,7 @@ dependencies = [ [[package]] name = "hc-wasmer-compiler" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#eaaebdbce520d642ee371ecf3cc18679f6847cd3" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#10722a12380a67949b6a8673fdfcd16810745526" dependencies = [ "backtrace", "bytes", @@ -876,7 +876,7 @@ dependencies = [ [[package]] name = "hc-wasmer-derive" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#eaaebdbce520d642ee371ecf3cc18679f6847cd3" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#10722a12380a67949b6a8673fdfcd16810745526" dependencies = [ "proc-macro-error", "proc-macro2", @@ -887,7 +887,7 @@ dependencies = [ [[package]] name = "hc-wasmer-types" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#eaaebdbce520d642ee371ecf3cc18679f6847cd3" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#10722a12380a67949b6a8673fdfcd16810745526" dependencies = [ "bytecheck", "enum-iterator", @@ -906,7 +906,7 @@ dependencies = [ [[package]] name = "hc-wasmer-vm" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#eaaebdbce520d642ee371ecf3cc18679f6847cd3" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#10722a12380a67949b6a8673fdfcd16810745526" dependencies = [ "backtrace", "cc", diff --git a/test/Cargo.lock b/test/Cargo.lock index 35ffe8d9..62cefa34 100644 --- a/test/Cargo.lock +++ b/test/Cargo.lock @@ -970,7 +970,7 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hc-wasmer" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#eaaebdbce520d642ee371ecf3cc18679f6847cd3" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#10722a12380a67949b6a8673fdfcd16810745526" dependencies = [ "bindgen", "bytes", @@ -1002,7 +1002,7 @@ dependencies = [ [[package]] name = "hc-wasmer-compiler" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#eaaebdbce520d642ee371ecf3cc18679f6847cd3" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#10722a12380a67949b6a8673fdfcd16810745526" dependencies = [ "backtrace", "bytes", @@ -1029,7 +1029,7 @@ dependencies = [ [[package]] name = "hc-wasmer-derive" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#eaaebdbce520d642ee371ecf3cc18679f6847cd3" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#10722a12380a67949b6a8673fdfcd16810745526" dependencies = [ "proc-macro-error", "proc-macro2", @@ -1040,7 +1040,7 @@ dependencies = [ [[package]] name = "hc-wasmer-types" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#eaaebdbce520d642ee371ecf3cc18679f6847cd3" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#10722a12380a67949b6a8673fdfcd16810745526" dependencies = [ "bytecheck", "enum-iterator", @@ -1059,7 +1059,7 @@ dependencies = [ [[package]] name = "hc-wasmer-vm" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#eaaebdbce520d642ee371ecf3cc18679f6847cd3" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#10722a12380a67949b6a8673fdfcd16810745526" dependencies = [ "backtrace", "cc", From c5cc0f79cb371fecbb1e8f1c627c23e862e21622 Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Sat, 31 Aug 2024 15:47:29 -0700 Subject: [PATCH 53/62] fix: bump wamr --- Cargo.lock | 10 +++++----- test/Cargo.lock | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ad5c9100..67c9d117 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -817,7 +817,7 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hc-wasmer" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#10722a12380a67949b6a8673fdfcd16810745526" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#9e8979478931b51cf1f1e3534568b5b0909291ab" dependencies = [ "bindgen", "bytes", @@ -849,7 +849,7 @@ dependencies = [ [[package]] name = "hc-wasmer-compiler" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#10722a12380a67949b6a8673fdfcd16810745526" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#9e8979478931b51cf1f1e3534568b5b0909291ab" dependencies = [ "backtrace", "bytes", @@ -876,7 +876,7 @@ dependencies = [ [[package]] name = "hc-wasmer-derive" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#10722a12380a67949b6a8673fdfcd16810745526" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#9e8979478931b51cf1f1e3534568b5b0909291ab" dependencies = [ "proc-macro-error", "proc-macro2", @@ -887,7 +887,7 @@ dependencies = [ [[package]] name = "hc-wasmer-types" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#10722a12380a67949b6a8673fdfcd16810745526" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#9e8979478931b51cf1f1e3534568b5b0909291ab" dependencies = [ "bytecheck", "enum-iterator", @@ -906,7 +906,7 @@ dependencies = [ [[package]] name = "hc-wasmer-vm" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#10722a12380a67949b6a8673fdfcd16810745526" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#9e8979478931b51cf1f1e3534568b5b0909291ab" dependencies = [ "backtrace", "cc", diff --git a/test/Cargo.lock b/test/Cargo.lock index 62cefa34..93603c17 100644 --- a/test/Cargo.lock +++ b/test/Cargo.lock @@ -970,7 +970,7 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hc-wasmer" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#10722a12380a67949b6a8673fdfcd16810745526" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#9e8979478931b51cf1f1e3534568b5b0909291ab" dependencies = [ "bindgen", "bytes", @@ -1002,7 +1002,7 @@ dependencies = [ [[package]] name = "hc-wasmer-compiler" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#10722a12380a67949b6a8673fdfcd16810745526" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#9e8979478931b51cf1f1e3534568b5b0909291ab" dependencies = [ "backtrace", "bytes", @@ -1029,7 +1029,7 @@ dependencies = [ [[package]] name = "hc-wasmer-derive" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#10722a12380a67949b6a8673fdfcd16810745526" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#9e8979478931b51cf1f1e3534568b5b0909291ab" dependencies = [ "proc-macro-error", "proc-macro2", @@ -1040,7 +1040,7 @@ dependencies = [ [[package]] name = "hc-wasmer-types" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#10722a12380a67949b6a8673fdfcd16810745526" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#9e8979478931b51cf1f1e3534568b5b0909291ab" dependencies = [ "bytecheck", "enum-iterator", @@ -1059,7 +1059,7 @@ dependencies = [ [[package]] name = "hc-wasmer-vm" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#10722a12380a67949b6a8673fdfcd16810745526" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#9e8979478931b51cf1f1e3534568b5b0909291ab" dependencies = [ "backtrace", "cc", From 8d497c77cc3ef0823d73b1ce0f6f5e6b7b286911 Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Sat, 31 Aug 2024 18:37:52 -0700 Subject: [PATCH 54/62] ci: pause work on attempting windows build with wasmer_wamr feature, explanatory comment --- .github/workflows/test.yml | 82 +++++++++++++++++++------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e19f0c87..1d777c37 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,60 +11,60 @@ concurrency: cancel-in-progress: true jobs: - # test-and-bench: - # strategy: - # fail-fast: false - # matrix: - # script: ["test", "bench"] - # os: ["ubuntu-latest", "macos-latest"] - # wasmer-feature: ["wasmer_sys", "wasmer_wamr"] - # runs-on: ${{ matrix.os }} - # steps: - # - uses: actions/checkout@v4 - # - name: Install nix - # uses: cachix/install-nix-action@v26 - # - name: Setup cachix - # uses: cachix/cachix-action@v14 - # if: ${{ ! contains(matrix.platform.runs-on, 'self-hosted') }} - # with: - # name: holochain-ci - # authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}" - # - run: nix develop --command ./scripts/${{ matrix.script }}-${{ matrix.wasmer-feature }}.sh + test-and-bench: + strategy: + fail-fast: false + matrix: + script: ["test", "bench"] + os: ["ubuntu-latest", "macos-latest"] + wasmer-feature: ["wasmer_sys", "wasmer_wamr"] + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v4 + - name: Install nix + uses: cachix/install-nix-action@v26 + - name: Setup cachix + uses: cachix/cachix-action@v14 + if: ${{ ! contains(matrix.platform.runs-on, 'self-hosted') }} + with: + name: holochain-ci + authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}" + - run: nix develop --command ./scripts/${{ matrix.script }}-${{ matrix.wasmer-feature }}.sh test-windows: strategy: fail-fast: false matrix: - wasmer-feature: [ - # "wasmer_sys", - "wasmer_wamr" - ] + wasmer-feature: + - "wasmer_sys", + # TODO Building with wasmer_wamr feature flag on windows is not currently working. + # See https://github.com/holochain/holochain-wasmer/issues/117 + # - "wasmer_wamr" runs-on: windows-latest steps: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable with: targets: wasm32-unknown-unknown - - name: install mingw - uses: mattyg/setup-scoop@7b8f657bc28ef6faa8a8ecfca6fa4095ca583aa3 - with: - buckets: versions - apps: versions/msys2 - name: test root run: cargo test --release --no-default-features --features error_as_host,${{ matrix.wasmer-feature }} -- --nocapture - name: test run: cargo test --release --manifest-path test/Cargo.toml --no-default-features --features ${{ matrix.wasmer-feature }} -- --nocapture - # bench-windows: - # strategy: - # fail-fast: false - # matrix: - # wasmer-feature: ["wasmer_sys", "wasmer_wamr"] - # runs-on: windows-latest - # steps: - # - uses: actions/checkout@v4 - # - uses: dtolnay/rust-toolchain@stable - # with: - # targets: wasm32-unknown-unknown - # - name: bench - # run: cd test && cargo bench --no-default-features --features error_as_host,${{ matrix.wasmer-feature }} \ No newline at end of file + bench-windows: + strategy: + fail-fast: false + matrix: + wasmer-feature: + - "wasmer_sys" + # TODO Building with wasmer_wamr feature flag on windows is not currently working. + # See https://github.com/holochain/holochain-wasmer/issues/117 + # - "wasmer_wamr" + runs-on: windows-latest + steps: + - uses: actions/checkout@v4 + - uses: dtolnay/rust-toolchain@stable + with: + targets: wasm32-unknown-unknown + - name: bench + run: cd test && cargo bench --no-default-features --features error_as_host,${{ matrix.wasmer-feature }} \ No newline at end of file From 782990b94e155bece13787def7c45e9cdec765be Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Sat, 31 Aug 2024 18:40:54 -0700 Subject: [PATCH 55/62] fix: typo --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1d777c37..aadb7951 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -35,8 +35,8 @@ jobs: strategy: fail-fast: false matrix: - wasmer-feature: - - "wasmer_sys", + wasmer-feature: + - "wasmer_sys" # TODO Building with wasmer_wamr feature flag on windows is not currently working. # See https://github.com/holochain/holochain-wasmer/issues/117 # - "wasmer_wamr" From 2ae1eda1ea1a0599ea2c95dd3bdaeefd24d354ab Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Sat, 31 Aug 2024 18:43:17 -0700 Subject: [PATCH 56/62] fix: invalid flag --- .github/workflows/test.yml | 2 +- scripts/bench-wasmer_sys.sh | 2 +- scripts/bench-wasmer_wamr.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index aadb7951..37595566 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -67,4 +67,4 @@ jobs: with: targets: wasm32-unknown-unknown - name: bench - run: cd test && cargo bench --no-default-features --features error_as_host,${{ matrix.wasmer-feature }} \ No newline at end of file + run: cd test && cargo bench --no-default-features --features ${{ matrix.wasmer-feature }} \ No newline at end of file diff --git a/scripts/bench-wasmer_sys.sh b/scripts/bench-wasmer_sys.sh index 407a801c..63909ae5 100755 --- a/scripts/bench-wasmer_sys.sh +++ b/scripts/bench-wasmer_sys.sh @@ -1,7 +1,7 @@ #! /usr/bin/env bash ( cd test && \ - cargo bench --no-default-features --features error_as_host,wasmer_sys + cargo bench --no-default-features --features wasmer_sys ) # it's possible to flamegraph the benchmarks like this: diff --git a/scripts/bench-wasmer_wamr.sh b/scripts/bench-wasmer_wamr.sh index 52ae2d49..0fe9b6a8 100755 --- a/scripts/bench-wasmer_wamr.sh +++ b/scripts/bench-wasmer_wamr.sh @@ -1,7 +1,7 @@ #! /usr/bin/env bash ( cd test && \ - cargo bench --no-default-features --features error_as_host,wasmer_wamr + cargo bench --no-default-features --features wasmer_wamr ) # it's possible to flamegraph the benchmarks like this: From 4d8277bfd2e0f9ca69e748ae9942ebe7a8aad838 Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Sat, 31 Aug 2024 18:47:57 -0700 Subject: [PATCH 57/62] chore: cleanup --- Cargo.lock | 18 ++++++++++++------ crates/host/Cargo.toml | 3 +-- crates/host/src/module/mod.rs | 1 - test/Cargo.lock | 18 ++++++++++++------ test/Cargo.toml | 3 +-- 5 files changed, 26 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 67c9d117..8c31c5cd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -284,7 +284,8 @@ dependencies = [ [[package]] name = "cmake" version = "0.1.51" -source = "git+https://github.com/mattyg/cmake-rs?branch=fix/invalid-arg-mingw-generator#af4d756c898c986829499de748d9201a3739a0b7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb1e43aa7fd152b1f968787f7dbcdeb306d1867ff373c69955211876c053f91a" dependencies = [ "cc", ] @@ -817,7 +818,8 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hc-wasmer" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#9e8979478931b51cf1f1e3534568b5b0909291ab" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8da36c1b427d5ab3b2bca996741a29538f6fba4b0a5dfe20e14fa0d32ec936e3" dependencies = [ "bindgen", "bytes", @@ -849,7 +851,8 @@ dependencies = [ [[package]] name = "hc-wasmer-compiler" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#9e8979478931b51cf1f1e3534568b5b0909291ab" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f63537e3d2aa18c9e7e0068d54be75b1a068f53eb7f1b7f7f3b528acd1e75e7" dependencies = [ "backtrace", "bytes", @@ -876,7 +879,8 @@ dependencies = [ [[package]] name = "hc-wasmer-derive" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#9e8979478931b51cf1f1e3534568b5b0909291ab" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "050c01c0e3193bc69b8cbdc47ec432a42aa4dc64964fc500e6740a12801694dc" dependencies = [ "proc-macro-error", "proc-macro2", @@ -887,7 +891,8 @@ dependencies = [ [[package]] name = "hc-wasmer-types" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#9e8979478931b51cf1f1e3534568b5b0909291ab" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7832ae1364df93ef680b31523c348204f25810e513b66dfd99d406d985d3e0e5" dependencies = [ "bytecheck", "enum-iterator", @@ -906,7 +911,8 @@ dependencies = [ [[package]] name = "hc-wasmer-vm" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#9e8979478931b51cf1f1e3534568b5b0909291ab" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6166b3a7b61b64cc71851a33cf01cc5dc8b159f5d05c2d2f650969016032c22f" dependencies = [ "backtrace", "cc", diff --git a/crates/host/Cargo.toml b/crates/host/Cargo.toml index 82a18089..dbd29d6a 100644 --- a/crates/host/Cargo.toml +++ b/crates/host/Cargo.toml @@ -11,8 +11,7 @@ wasmer = { version = "=4.3.6", optional = true, default-feature = false } wasmer-middlewares = { version = "=4.3.6", optional = true, default-feature = false } # Temporarily include a fork of wasmer from the git branch 'wamr', until it is officially released in wasmer v5 -#hc-wasmer = { version="=4.3.6-hc.1", optional = true, default-features = false } -hc-wasmer = { git = "https://github.com/holochain/wasmer", branch = "fix/win32-build", optional = true, default-features = false } +hc-wasmer = { version="=4.3.6-hc.1", optional = true, default-features = false } holochain_wasmer_common = { version = "=0.0.96", path = "../common" } holochain_serialized_bytes = "=0.0.55" diff --git a/crates/host/src/module/mod.rs b/crates/host/src/module/mod.rs index e6883432..ee83528c 100644 --- a/crates/host/src/module/mod.rs +++ b/crates/host/src/module/mod.rs @@ -225,7 +225,6 @@ impl SerializedModuleCache { }); let (module, serialized_module) = match module_load { Some(Ok(serialized_module)) => { - tracing::info!("get_with_build_cache serialized_module={:?}", serialized_module); let deserialized_module = unsafe { Module::deserialize(&self.runtime_engine, serialized_module.clone()) } .map_err(|e| wasm_error!(WasmErrorInner::Compile(e.to_string())))?; diff --git a/test/Cargo.lock b/test/Cargo.lock index 93603c17..cbb07f9e 100644 --- a/test/Cargo.lock +++ b/test/Cargo.lock @@ -362,7 +362,8 @@ checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "cmake" version = "0.1.51" -source = "git+https://github.com/mattyg/cmake-rs?branch=fix/invalid-arg-mingw-generator#af4d756c898c986829499de748d9201a3739a0b7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb1e43aa7fd152b1f968787f7dbcdeb306d1867ff373c69955211876c053f91a" dependencies = [ "cc", ] @@ -970,7 +971,8 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hc-wasmer" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#9e8979478931b51cf1f1e3534568b5b0909291ab" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8da36c1b427d5ab3b2bca996741a29538f6fba4b0a5dfe20e14fa0d32ec936e3" dependencies = [ "bindgen", "bytes", @@ -1002,7 +1004,8 @@ dependencies = [ [[package]] name = "hc-wasmer-compiler" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#9e8979478931b51cf1f1e3534568b5b0909291ab" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f63537e3d2aa18c9e7e0068d54be75b1a068f53eb7f1b7f7f3b528acd1e75e7" dependencies = [ "backtrace", "bytes", @@ -1029,7 +1032,8 @@ dependencies = [ [[package]] name = "hc-wasmer-derive" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#9e8979478931b51cf1f1e3534568b5b0909291ab" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "050c01c0e3193bc69b8cbdc47ec432a42aa4dc64964fc500e6740a12801694dc" dependencies = [ "proc-macro-error", "proc-macro2", @@ -1040,7 +1044,8 @@ dependencies = [ [[package]] name = "hc-wasmer-types" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#9e8979478931b51cf1f1e3534568b5b0909291ab" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7832ae1364df93ef680b31523c348204f25810e513b66dfd99d406d985d3e0e5" dependencies = [ "bytecheck", "enum-iterator", @@ -1059,7 +1064,8 @@ dependencies = [ [[package]] name = "hc-wasmer-vm" version = "4.3.6-hc.1" -source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#9e8979478931b51cf1f1e3534568b5b0909291ab" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6166b3a7b61b64cc71851a33cf01cc5dc8b159f5d05c2d2f650969016032c22f" dependencies = [ "backtrace", "cc", diff --git a/test/Cargo.toml b/test/Cargo.toml index e0623fef..5d34c246 100644 --- a/test/Cargo.toml +++ b/test/Cargo.toml @@ -22,8 +22,7 @@ wasmer = { version = "=4.3.6", optional = true, default-features = false } wasmer-middlewares = { version = "=4.3.6", optional = true, default-features = false } # Temporarily include a fork of wasmer from the git branch 'wamr', until it is officially released in wasmer v5 -#hc-wasmer = { version="=4.3.6-hc.1", optional = true, default-features = false } -hc-wasmer = { git = "https://github.com/holochain/wasmer", branch = "fix/win32-build", optional = true, default-features = false } +hc-wasmer = { version="=4.3.6-hc.1", optional = true, default-features = false } [dev-dependencies] env_logger = "0.8" From 4c1a0c816ced986ed797d9bfe9676b359ffe77ac Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Sun, 1 Sep 2024 08:32:34 -0700 Subject: [PATCH 58/62] ci: try to resolve ubuntu ci being cancelled - maybe its out of memory? --- .github/workflows/test.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 37595566..e34077ca 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,6 +20,11 @@ jobs: wasmer-feature: ["wasmer_sys", "wasmer_wamr"] runs-on: ${{ matrix.os }} steps: + - name: increase swap space + if: matrix.os == "ubuntu-latest" + uses: actionhippie/swap-space@v1 + with: + size: 10G - uses: actions/checkout@v4 - name: Install nix uses: cachix/install-nix-action@v26 From 69ba4a7ea15502b00d3e5534356f0d8b8c642ae7 Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Sun, 1 Sep 2024 08:35:56 -0700 Subject: [PATCH 59/62] fix: syntax --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e34077ca..12bd6b1e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -21,7 +21,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: increase swap space - if: matrix.os == "ubuntu-latest" + if: matrix.os == 'ubuntu-latest' uses: actionhippie/swap-space@v1 with: size: 10G From 94c8ab2121aeea5748f982fd4e266568246f1300 Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Sun, 1 Sep 2024 13:40:44 -0700 Subject: [PATCH 60/62] fix: moar swap space --- .github/workflows/test.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 12bd6b1e..ca63fa2c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,13 +18,19 @@ jobs: script: ["test", "bench"] os: ["ubuntu-latest", "macos-latest"] wasmer-feature: ["wasmer_sys", "wasmer_wamr"] + exclude: + # TODO bench suite on macos-latest is killed by system due to running out of swap space + # All benches run fine individually + - script: bench + os: macos-latest + wasmer-feature: wasmer_wamr runs-on: ${{ matrix.os }} steps: - name: increase swap space if: matrix.os == 'ubuntu-latest' uses: actionhippie/swap-space@v1 with: - size: 10G + size: 15G - uses: actions/checkout@v4 - name: Install nix uses: cachix/install-nix-action@v26 From e0f17800ff169082e3815e857c65254d98661588 Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Wed, 11 Sep 2024 08:34:35 -0700 Subject: [PATCH 61/62] ci: only run bench on ubuntu --- .github/workflows/test.yml | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ca63fa2c..6ef64124 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -61,21 +61,3 @@ jobs: run: cargo test --release --no-default-features --features error_as_host,${{ matrix.wasmer-feature }} -- --nocapture - name: test run: cargo test --release --manifest-path test/Cargo.toml --no-default-features --features ${{ matrix.wasmer-feature }} -- --nocapture - - bench-windows: - strategy: - fail-fast: false - matrix: - wasmer-feature: - - "wasmer_sys" - # TODO Building with wasmer_wamr feature flag on windows is not currently working. - # See https://github.com/holochain/holochain-wasmer/issues/117 - # - "wasmer_wamr" - runs-on: windows-latest - steps: - - uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@stable - with: - targets: wasm32-unknown-unknown - - name: bench - run: cd test && cargo bench --no-default-features --features ${{ matrix.wasmer-feature }} \ No newline at end of file From cd985e0a08d4a020bad8f815bd80956915620adf Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Wed, 11 Sep 2024 14:08:09 -0700 Subject: [PATCH 62/62] fix: workflow concurrency group should be only for that pr --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6ef64124..a227266c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -7,8 +7,8 @@ on: pull_request: {} concurrency: - group: ${{ github.head_ref }} - cancel-in-progress: true + group: test-${{ github.workflow }}-${{ github.ref || github.run_id }} + cancel-in-progress: ${{ github.event_name == 'pull_request' }} jobs: test-and-bench: