Merge branch 'main' into feat/support-build-module-outside-cache

holochain · Nov 27, 2024 · 052dca6 · 052dca6
2 parents 85336ee + b7eb114
commit 052dca6
Show file tree

Hide file tree

Showing 25 changed files with 1,401 additions and 1,557 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -17,7 +17,7 @@ jobs:
       matrix:
         script: ["test", "bench"]
         os: ["ubuntu-latest", "macos-latest"]
-        wasmer-feature: ["wasmer_sys", "wasmer_wamr"]
+        wasmer-feature: ["wasmer_sys_dev", "wasmer_sys_prod", "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
@@ -33,9 +33,9 @@ jobs:
           size: 15G
       - uses: actions/checkout@v4
       - name: Install nix
-        uses: cachix/install-nix-action@v26
+        uses: cachix/install-nix-action@v30
       - name: Setup cachix
-        uses: cachix/cachix-action@v14
+        uses: cachix/cachix-action@v15
         if: ${{ ! contains(matrix.platform.runs-on, 'self-hosted') }}
         with:
           name: holochain-ci
@@ -47,7 +47,8 @@ jobs:
       fail-fast: false
       matrix:
         wasmer-feature: 
-          - "wasmer_sys" 
+          - "wasmer_sys_dev"
+          - "wasmer_sys_prod"
           # TODO Building with wasmer_wamr feature flag on windows is not currently working.
           # See https://github.com/holochain/holochain-wasmer/issues/117
           # - "wasmer_wamr"
@@ -57,7 +58,21 @@ jobs:
       - uses: dtolnay/rust-toolchain@stable
         with:
           targets: wasm32-unknown-unknown
+      - name: Install LLVM
+        env:
+          LLVM_DIR: .llvm
+        shell: bash
+        run: |
+          LLVM_DIR=$(pwd)/${{ env.LLVM_DIR }}
+          mkdir -p ${LLVM_DIR}
+          curl --proto '=https' --tlsv1.2 -sSf "https://github.com/wasmerio/llvm-custom-builds/releases/download/18.x/llvm-windows-amd64.tar.xz" -L -o - | tar xJv -C ${LLVM_DIR}
       - name: test root
-        run: cargo test --release --no-default-features --features error_as_host,${{ matrix.wasmer-feature }} -- --nocapture
+        shell: pwsh
+        run: |
+          $env:LLVM_SYS_180_PREFIX="$(pwd)/.llvm"
+          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
+        shell: pwsh
+        run: |
+          $env:LLVM_SYS_180_PREFIX="$(pwd)/.llvm"
+          cargo test --release --manifest-path test/Cargo.toml --no-default-features --features ${{ matrix.wasmer-feature }} -- --nocapture
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,17 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 ## [Unreleased]
 
+### Changed
+
+- Upgrade wasmer to 5.x
+- **BREAKING CHANGE** The `wasmer_sys` feature has been renamed to `wasmer_sys_dev`
+
+### Added
+- A new feature flag, `wasmer_sys_prod` which enables the Wasmer LLVM compiler. The default, with the `wasmer_sys_dev` feature
+  is the Cranelift compiler. The Cranelift compiler is fast, and recommended for development, but the LLVM compiler is supposed
+  to be faster and more optimized for production. In testing so far, the compile step is slower with LLVM but the runtime is
+  faster. More testing is needed yet to confirm the difference.
+
 ## [0.0.93] - 2024-04-24
 
 ### Changed