chore(*) compile Wasmtime with 'posix-signals-on-macos' on macOS

Kong · Jul 31, 2023 · 7036dbd · 7036dbd
1 parent fb47584
commit 7036dbd
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -156,10 +156,16 @@ jobs:
         uses: acifani/setup-tinygo@v1
         with:
           tinygo-version: 0.27.0
-      - name: Setup Wasm runtime
+      - name: Setup Wasm runtime (Linux)
+        if: ${{ matrix.os == 'ubuntu-latest' || matrix.runtime != 'wasmtime' }}
         run: ./util/runtime.sh -R ${{ matrix.runtime }} -V ${{ matrix[matrix.runtime] }}
         env:
           GITHUB_OAUTH_TOKEN: ${{ secrets.GH_BOT_TOKEN }}
+      - name: Setup Wasm runtime (macOS)
+        if: ${{ matrix.os == 'macos-latest' && matrix.runtime == 'wasmtime' }}
+        run: ./util/runtime.sh -R ${{ matrix.runtime }} -V ${{ matrix[matrix.runtime] }} --build
+        env:
+          GITHUB_OAUTH_TOKEN: ${{ secrets.GH_BOT_TOKEN }}
       - run: make setup
       - run: make
         env:

diff --git a/util/runtimes/wasmtime.sh b/util/runtimes/wasmtime.sh
@@ -108,6 +108,11 @@ build_wasmtime() {
                 cargo_target_dir="target/release"
             fi
 
+            if [ "$(uname -s)" = "Darwin" ]; then
+                # See https://github.com/bytecodealliance/wasmtime/issues/6785
+                args+="--features posix-signals-on-macos"
+            fi
+
             if [ "$clean" = "clean" -a -d $cargo_target_dir ]; then
                 rm -rf $cargo_target_dir
             fi