ci: add subdir support

Signed-off-by: Roman Volosatovs <[email protected]>

ci/vendor-wit.sh

@@ -19,18 +19,18 @@ make_vendor() {
   mkdir -p $path
 
   for package in $packages; do
-    IFS='@' read -r repo tag <<< "$package"
-    mkdir -p $path/$package
+    IFS='@' read -r repo tag subdir <<< "$package"
+    mkdir -p "$path/$package"
     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*
+      rm -rf $cached_extracted_dir/${subdir:-"wit"}/deps*
     fi
 
-    cp -r $cached_extracted_dir/wit/* $path/$package
+    cp -r $cached_extracted_dir/${subdir:-"wit"}/* $path/$package
   done
 }
 
@@ -43,7 +43,7 @@ make_vendor "wasi" "
   [email protected]
   [email protected]
   [email protected]
-  random@3e99124
+  random@3e99124@wit-0.3.0-draft
 "
 
 make_vendor "wasi-http" "
@@ -54,7 +54,7 @@ make_vendor "wasi-http" "
   [email protected]
   [email protected]
   [email protected]
-  random@3e99124
+  random@3e99124@wit-0.3.0-draft
 "
 
 make_vendor "wasi-config" "config@f4d699b"

crates/wasi-http/wit/deps/random@3e99124/insecure-seed.wit → crates/wasi-http/wit/deps/random@3e99124@wit-0.3.0-draft/insecure-seed.wit

@@ -1,9 +1,9 @@
-package wasi:random@0.2.3;
+package wasi:random@0.3.0;
 /// The insecure-seed interface for seeding hash-map DoS resistance.
 ///
 /// It is intended to be portable at least between Unix-family platforms and
 /// Windows.
-@since(version = 0.2.0)
+@since(version = 0.3.0)
 interface insecure-seed {
     /// Return a 128-bit value that may contain a pseudo-random value.
     ///
@@ -22,6 +22,6 @@ interface insecure-seed {
     /// This will likely be changed to a value import, to prevent it from being
     /// called multiple times and potentially used for purposes other than DoS
     /// protection.
-    @since(version = 0.2.0)
+    @since(version = 0.3.0)
     insecure-seed: func() -> tuple<u64, u64>;
 }

crates/wasi-http/wit/deps/random@3e99124/insecure.wit → crates/wasi-http/wit/deps/random@3e99124@wit-0.3.0-draft/insecure.wit

@@ -1,9 +1,9 @@
-package wasi:random@0.2.3;
+package wasi:random@0.3.0;
 /// The insecure interface for insecure pseudo-random numbers.
 ///
 /// It is intended to be portable at least between Unix-family platforms and
 /// Windows.
-@since(version = 0.2.0)
+@since(version = 0.3.0)
 interface insecure {
     /// Return `len` insecure pseudo-random bytes.
     ///
@@ -13,13 +13,13 @@ interface insecure {
     /// There are no requirements on the values of the returned bytes, however
     /// implementations are encouraged to return evenly distributed values with
     /// a long period.
-    @since(version = 0.2.0)
+    @since(version = 0.3.0)
     get-insecure-random-bytes: func(len: u64) -> list<u8>;
 
     /// Return an insecure pseudo-random `u64` value.
     ///
     /// This function returns the same type of pseudo-random data as
     /// `get-insecure-random-bytes`, represented as a `u64`.
-    @since(version = 0.2.0)
+    @since(version = 0.3.0)
     get-insecure-random-u64: func() -> u64;
 }

crates/wasi-http/wit/deps/random@3e99124/random.wit → crates/wasi-http/wit/deps/random@3e99124@wit-0.3.0-draft/random.wit

@@ -1,9 +1,9 @@
-package wasi:random@0.2.3;
+package wasi:random@0.3.0;
 /// WASI Random is a random data API.
 ///
 /// It is intended to be portable at least between Unix-family platforms and
 /// Windows.
-@since(version = 0.2.0)
+@since(version = 0.3.0)
 interface random {
     /// Return `len` cryptographically-secure random or pseudo-random bytes.
     ///
@@ -17,13 +17,13 @@ interface random {
     /// This function must always return fresh data. Deterministic environments
     /// must omit this function, rather than implementing it with deterministic
     /// data.
-    @since(version = 0.2.0)
+    @since(version = 0.3.0)
     get-random-bytes: func(len: u64) -> list<u8>;
 
     /// Return a cryptographically-secure random or pseudo-random `u64` value.
     ///
     /// This function returns the same type of data as `get-random-bytes`,
     /// represented as a `u64`.
-    @since(version = 0.2.0)
+    @since(version = 0.3.0)
     get-random-u64: func() -> u64;
 }

crates/wasi-http/wit/deps/random@3e99124@wit-0.3.0-draft/world.wit

@@ -0,0 +1,13 @@
+package wasi:random@0.3.0;
+
+@since(version = 0.3.0)
+world imports {
+    @since(version = 0.3.0)
+    import random;
+
+    @since(version = 0.3.0)
+    import insecure;
+
+    @since(version = 0.3.0)
+    import insecure-seed;
+}

crates/wasi/wit/deps/random@3e99124/insecure-seed.wit → crates/wasi/wit/deps/random@3e99124@wit-0.3.0-draft/insecure-seed.wit

@@ -1,9 +1,9 @@
-package wasi:random@0.2.3;
+package wasi:random@0.3.0;
 /// The insecure-seed interface for seeding hash-map DoS resistance.
 ///
 /// It is intended to be portable at least between Unix-family platforms and
 /// Windows.
-@since(version = 0.2.0)
+@since(version = 0.3.0)
 interface insecure-seed {
     /// Return a 128-bit value that may contain a pseudo-random value.
     ///
@@ -22,6 +22,6 @@ interface insecure-seed {
     /// This will likely be changed to a value import, to prevent it from being
     /// called multiple times and potentially used for purposes other than DoS
     /// protection.
-    @since(version = 0.2.0)
+    @since(version = 0.3.0)
     insecure-seed: func() -> tuple<u64, u64>;
 }

crates/wasi/wit/deps/random@3e99124/insecure.wit → crates/wasi/wit/deps/random@3e99124@wit-0.3.0-draft/insecure.wit

@@ -1,9 +1,9 @@
-package wasi:random@0.2.3;
+package wasi:random@0.3.0;
 /// The insecure interface for insecure pseudo-random numbers.
 ///
 /// It is intended to be portable at least between Unix-family platforms and
 /// Windows.
-@since(version = 0.2.0)
+@since(version = 0.3.0)
 interface insecure {
     /// Return `len` insecure pseudo-random bytes.
     ///
@@ -13,13 +13,13 @@ interface insecure {
     /// There are no requirements on the values of the returned bytes, however
     /// implementations are encouraged to return evenly distributed values with
     /// a long period.
-    @since(version = 0.2.0)
+    @since(version = 0.3.0)
     get-insecure-random-bytes: func(len: u64) -> list<u8>;
 
     /// Return an insecure pseudo-random `u64` value.
     ///
     /// This function returns the same type of pseudo-random data as
     /// `get-insecure-random-bytes`, represented as a `u64`.
-    @since(version = 0.2.0)
+    @since(version = 0.3.0)
     get-insecure-random-u64: func() -> u64;
 }

crates/wasi/wit/deps/random@3e99124/random.wit → crates/wasi/wit/deps/random@3e99124@wit-0.3.0-draft/random.wit

@@ -1,9 +1,9 @@
-package wasi:random@0.2.3;
+package wasi:random@0.3.0;
 /// WASI Random is a random data API.
 ///
 /// It is intended to be portable at least between Unix-family platforms and
 /// Windows.
-@since(version = 0.2.0)
+@since(version = 0.3.0)
 interface random {
     /// Return `len` cryptographically-secure random or pseudo-random bytes.
     ///
@@ -17,13 +17,13 @@ interface random {
     /// This function must always return fresh data. Deterministic environments
     /// must omit this function, rather than implementing it with deterministic
     /// data.
-    @since(version = 0.2.0)
+    @since(version = 0.3.0)
     get-random-bytes: func(len: u64) -> list<u8>;
 
     /// Return a cryptographically-secure random or pseudo-random `u64` value.
     ///
     /// This function returns the same type of data as `get-random-bytes`,
     /// represented as a `u64`.
-    @since(version = 0.2.0)
+    @since(version = 0.3.0)
     get-random-u64: func() -> u64;
 }

crates/wasi/wit/deps/random@3e99124@wit-0.3.0-draft/world.wit

@@ -0,0 +1,13 @@
+package wasi:random@0.3.0;
+
+@since(version = 0.3.0)
+world imports {
+    @since(version = 0.3.0)
+    import random;
+
+    @since(version = 0.3.0)
+    import insecure;
+
+    @since(version = 0.3.0)
+    import insecure-seed;
+}