Merge with upstream

Author: dhil

.github/workflows/main.yml

@@ -58,19 +58,21 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
+        lang: [c, rust, teavm-java, go, csharp]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
       with:
         submodules: true
     - name: Install Rust
       run: rustup update stable --no-self-update && rustup default stable
-    - name: Install wasm32-unknown-unknown target
-      run: rustup target add wasm32-unknown-unknown
-    - name: Install wasm32-wasi target
-      run: rustup target add wasm32-wasi
+    - run: rustup target add wasm32-wasip1
+
+    - run: rustup target add wasm32-unknown-unknown
+      if: matrix.lang == 'rust'
 
     - uses: ./.github/actions/install-wasi-sdk
+      if: matrix.lang == 'c' || (matrix.lang == 'csharp' && matrix.os == 'windows-latest')
 
     - run: |
         curl.exe -LO https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.ps1
@@ -80,25 +82,45 @@ jobs:
         echo $LOCALAPPDATA'\Microsoft\dotnet' >> $GITHUB_PATH
         echo $LOCALAPPDATA'\Microsoft\dotnet\tools' >> $GITHUB_PATH
         $LOCALAPPDATA/Microsoft/dotnet/dotnet --info
-      if : matrix.os == 'windows-latest'
+      if: matrix.os == 'windows-latest' && matrix.lang == 'csharp'
 
     - run: ci/download-teavm.sh
-
-    - uses: actions/setup-node@v4
-      with:
-        node-version: '16'
+      if: matrix.lang == 'teavm-java'
     - uses: actions/setup-java@v4
+      if: matrix.lang == 'teavm-java'
       with:
         java-version: '18'
         distribution: 'adopt'
+
     - uses: actions/setup-go@v4
+      if: matrix.lang == 'go'
       with:
         go-version: '1.20'
     - uses: acifani/setup-tinygo@v2
+      if: matrix.lang == 'go'
       with:
         tinygo-version: 0.31.0
-    - name: cargo test --workspace
-      run: cargo test --workspace
+
+    - run: |
+        cargo test \
+          -p wit-bindgen-cli \
+          -p wit-bindgen-${{ matrix.lang }} \
+          --no-default-features \
+          --features ${{ matrix.lang }}
+
+  test_unit:
+    name: Crate Unit Tests
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: true
+    - name: Install Rust
+      run: rustup update stable --no-self-update && rustup default stable
+    - run: rustup target add wasm32-wasip1
+    - run: cargo test -p wit-bindgen-core
+    - run: cargo test -p wit-bindgen
+    - run: cargo test --workspace --exclude 'wit-bindgen*'
 
   check:
     name: Check
@@ -109,8 +131,8 @@ jobs:
       run: rustup update stable --no-self-update && rustup default stable
     - name: Install wasm32-unknown-unknown target
       run: rustup target add wasm32-unknown-unknown
-    - name: Install wasm32-wasi target
-      run: rustup target add wasm32-wasi
+    - name: Install wasm32-wasip1 target
+      run: rustup target add wasm32-wasip1
 
     # Verify the output of the `./ci/rebuild-libcabi-realloc.sh` script is
     # up-to-date.
@@ -129,10 +151,10 @@ jobs:
     - run: cargo build --no-default-features --features markdown
 
     # Feature combos of the `wit-bindgen` crate
-    - run: cargo build --target wasm32-wasi -p wit-bindgen --no-default-features
-    - run: cargo build --target wasm32-wasi -p wit-bindgen --no-default-features --features realloc
-    - run: cargo build --target wasm32-wasi -p wit-bindgen --no-default-features --features macros
-    - run: cargo build --target wasm32-wasi -p wit-bindgen --no-default-features --features macros,realloc
+    - run: cargo build --target wasm32-wasip1 -p wit-bindgen --no-default-features
+    - run: cargo build --target wasm32-wasip1 -p wit-bindgen --no-default-features --features realloc
+    - run: cargo build --target wasm32-wasip1 -p wit-bindgen --no-default-features --features macros
+    - run: cargo build --target wasm32-wasip1 -p wit-bindgen --no-default-features --features macros,realloc
 
     # Verity that documentation can be generated for the rust bindings crate.
     - run: cargo doc -p wit-bindgen --no-deps
@@ -169,6 +191,7 @@ jobs:
     runs-on: ubuntu-latest
     needs:
       - test
+      - test_unit
       - rustfmt
       - build
       - verify-publish