chore: Add rust dependencies to gh-actions

Signed-off-by: Gordon Smith <GordonJSmith@gmail.com>

Author: GordonSmith

.github/workflows/macos.yml

@@ -37,13 +37,20 @@ jobs:
 
       - uses: actions/cache@v3
         with:
-          path: "build/vcpkg_installed/**/*"
-          key: ${{ matrix.os }}-vcpkg_installed
+          key: ${{ matrix.os }}-packages
+          path: |
+            "build/vcpkg_installed/**/*"
+            ~/.cargo/registry
+            ~/.cargo/git
 
       - name: install dependencies
         run: |
           brew install pkg-config autoconf autoconf-archive automake coreutils libtool cmake ninja
 
+      - name: Install rust dependencies
+        run: |
+          cargo install wasm-tools wit-bindgen-cli 
+
       - name: configure
         run: |
           cmake --preset linux-ninja-Debug

.github/workflows/ubuntu.yml

@@ -30,9 +30,13 @@ jobs:
           submodules: recursive
 
       - uses: actions/cache@v3
+        if: always() 
         with:
-          path: "build/vcpkg_installed/**/*"
-          key: ${{ matrix.os }}-vcpkg_installed
+          key: ${{ matrix.os }}-packages
+          path: |
+            "build/vcpkg_installed/**/*"
+            ~/.cargo/registry
+            ~/.cargo/git
 
       - name: install dependencies
         run: |
@@ -43,6 +47,10 @@ jobs:
           build-essential \
           ninja-build
 
+      - name: Install rust dependencies
+        run: |
+          cargo install wasm-tools wit-bindgen-cli 
+
       - name: configure
         run: |
           cmake --preset linux-ninja-Debug

.github/workflows/windows.yml

@@ -31,9 +31,17 @@ jobs:
           submodules: recursive
 
       - uses: actions/cache@v3
+        if: always() 
         with:
-          path: "build/vcpkg_installed/**/*"
-          key: ${{ matrix.os }}-vcpkg_installed
+          key: ${{ matrix.os }}-packages
+          path: |
+            "build/vcpkg_installed/**/*"
+            ~/.cargo/registry
+            ~/.cargo/git
+
+      - name: Install rust dependencies
+        run: |
+          cargo install wasm-tools wit-bindgen-cli 
 
       - name: configure
         run: |

vcpkg_overlays/wasi-sdk/portfile.cmake

@@ -1,9 +1,26 @@
+# https://github.com/WebAssembly/wasi-sdk/releases
+
+if(APPLE)
+vcpkg_download_distfile(ARCHIVE
+    URLS "https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-25/wasi-sdk-${VERSION}-arm64-macos.tar.gz"
+    FILENAME "wasi-sdk-${VERSION}-x86_64-linux.tar.gz"
+    SHA512 0
+)
+elseif(UNIX)
 vcpkg_download_distfile(ARCHIVE
     URLS "https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-25/wasi-sdk-${VERSION}-x86_64-linux.tar.gz"
     FILENAME "wasi-sdk-${VERSION}-x86_64-linux.tar.gz"
     SHA512 716acc4b737ad6f51c6b32c3423612c03df9a3165bde3d6e24df5c86779b8be9463f5a79e620f2fc49707275563a6c9710242caca27e1ad9dd2c69e8fce8a766
 )
 
+elseif(WIN32)
+vcpkg_download_distfile(ARCHIVE
+    URLS "https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-25/wasi-sdk-${VERSION}-x86_64-windows.tar.gz"
+    FILENAME "wasi-sdk-${VERSION}-x86_64-windows.tar.gz"
+    SHA512 0
+)
+endif()
+
 vcpkg_extract_source_archive_ex(
     OUT_SOURCE_PATH SOURCE_PATH
     ARCHIVE ${ARCHIVE}

vcpkg_overlays/wasi-sdk/vcpkg.json

@@ -3,6 +3,5 @@
   "version-string": "25.0",
   "description": "Wasi SDK for building wasm from C++.",
   "homepage": "https://github.com/WebAssembly/wasi-sdk",
-  "supports": "linux",
   "license": "Apache-2.0"
 }