Fix CI and update dependencies (#127)

* Fix CI and update dependencies

* Use crates.io-published wit-bindgen

* Try to fix Windows

* Try again for Windows

Author: alexcrichton

.github/actions/setup/action.yml

@@ -33,19 +33,24 @@ runs:
 
   # Install the `wasm-tools` binary with the `component` subcommand that is all
   # that's needed here.
-  - uses: actions/cache@v3
-    with:
-      path: ${{ runner.tool_cache }}/wasm-tools
-      key: wasm-tools-bin-1.0.19-${{ runner.os }}
-  - run: echo '${{ runner.tool_cache }}/wasm-tools/bin' >> $GITHUB_PATH
+  - run: |
+      echo WASM_TOOLS=wasm-tools-1.0.23 >> $GITHUB_ENV
+      mkdir -p '${{ runner.tool_cache }}/wasm-tools'
+      echo '${{ runner.tool_cache }}/wasm-tools' >> $GITHUB_PATH
+    shell: bash
+  - run: |
+      curl -L https://github.com/bytecodealliance/wasm-tools/releases/download/$WASM_TOOLS/$WASM_TOOLS-x86_64-linux.tar.gz | tar xzv -C ${{ runner.tool_cache }}/wasm-tools --strip-components 1
+    if: runner.os == 'Linux'
+    shell: bash
+  - run: |
+      curl -L https://github.com/bytecodealliance/wasm-tools/releases/download/$WASM_TOOLS/$WASM_TOOLS-x86_64-macos.tar.gz | tar xzv -C ${{ runner.tool_cache }}/wasm-tools --strip-components 1
+    if: runner.os == 'macOS'
     shell: bash
   - run: |
-      cargo install \
-        wasm-tools@1.0.19 \
-        --root '${{ runner.tool_cache }}/wasm-tools' \
-        --locked \
-        --no-default-features \
-        --features component
+      path='${{ runner.tool_cache }}/wasm-tools'
+      curl -o "$path/bins.zip" -L https://github.com/bytecodealliance/wasm-tools/releases/download/$WASM_TOOLS/$WASM_TOOLS-x86_64-windows.zip
+      7z e "$path/bins.zip" -o"$path"
+    if: runner.os == 'Windows'
     shell: bash
 
   # Build the bindgen wasm blob with some extra Rust targets.

rust/Cargo.lock

@@ -1,15 +1,11 @@
 [workspace]
 members = ['bindgen', 'wasi_snapshot_preview1']
 
-[workspace.dependencies.wit-bindgen-guest-rust]
-git = 'https://github.com/bytecodealliance/wit-bindgen'
-default-features = false
-features = ['macros']
+[workspace.dependencies]
+wit-bindgen = { version = "0.3.0", default-features = false, features = ['macros'] }
 
 [profile.release]
 strip = 'debuginfo'
 
 [patch.crates-io]
-wasmtime-environ = { git = 'https://github.com/bytecodealliance/wasmtime' }
-wit-component = { git = 'https://github.com/bytecodealliance/wasm-tools' }
-wit-parser = { git = 'https://github.com/bytecodealliance/wasm-tools' }
+wasmtime-environ = { git = 'https://github.com/bytecodealliance/wasmtime', branch = 'release-6.0.0' }

rust/Cargo.toml

@@ -11,11 +11,11 @@ crate-type = ['cdylib', 'rlib']
 [dependencies]
 anyhow = "1.0"
 heck = { version = "0.4", features = ["unicode"] }
-wit-component = "0.4"
-wit-parser = "0.4"
+wit-component = "0.6"
+wit-parser = "0.6"
 indexmap = "1.0"
 wasmtime-environ = { version = "6.0.0", features = ['component-model'] }
-wit-bindgen-guest-rust = { workspace = true, features = ['default'] }
+wit-bindgen = { workspace = true, features = ['default'] }
 
 [features]
 cli = []