Merge pull request #16 from wacker-dev/build

Use bash script instead of build script to manage wit dependencies

.github/workflows/ci.yml

@@ -17,6 +17,10 @@ jobs:
         with:
           targets: wasm32-wasip1
           components: clippy, rustfmt
+      - name: Re-vendor WIT
+        run: |
+          ./scripts/vendor-wit.sh
+          git diff --exit-code
       - name: cargo fmt
         run: cargo fmt --all -- --check
       - name: cargo clippy

scripts/vendor-wit.sh

@@ -0,0 +1,47 @@
+#!/usr/bin/env bash
+
+# Script to re-vendor the WIT files.
+#
+# This script is also executed on CI to ensure that everything is up-to-date.
+set -ex
+
+# The make_vendor function takes a base path (e.g., "wasi") and a list
+# of packages in the format "name@tag". It constructs the full destination
+# path, downloads the tarballs from GitHub, extracts the relevant files, and
+# removes any unwanted directories.
+make_vendor() {
+  local packages=$1
+  local path="waki/wit/deps"
+
+  rm -rf $path
+  mkdir -p $path
+
+  for package in $packages; do
+    IFS='@' read -r repo tag <<< "$package"
+    mkdir -p $path/$repo
+    cached_extracted_dir="$cache_dir/$repo-$tag"
+
+    if [[ ! -d $cached_extracted_dir ]]; then
+      mkdir -p $cached_extracted_dir
+      curl -sL https://github.com/WebAssembly/wasi-$repo/archive/$tag.tar.gz | \
+        tar xzf - --strip-components=1 -C $cached_extracted_dir
+      rm -rf $cached_extracted_dir/wit/deps*
+    fi
+
+    cp -r $cached_extracted_dir/wit/* $path/$repo
+  done
+}
+
+cache_dir=$(mktemp -d)
+
+make_vendor "
+  [email protected]
+  [email protected]
+  [email protected]
+  [email protected]
+  [email protected]
+  [email protected]
+  [email protected]
+"
+
+rm -rf $cache_dir

waki/Cargo.toml

@@ -35,10 +35,6 @@ httparse = { version = "1.9.3", optional = true }
 json = ["dep:serde_json"]
 multipart = ["dep:mime", "dep:mime_guess", "dep:rand", "dep:memchr", "dep:bytes", "dep:httparse"]
 
-[build-dependencies]
-anyhow.workspace = true
-wit-deps = "0.3.1"
-
 [dev-dependencies]
 test-programs-artifacts = { path = "../test-programs/artifacts" }