Merge branch 'main' into configure-probes

Author: rklaehn

.github/workflows/ci.yml

@@ -200,10 +200,10 @@ jobs:
         run: cargo build --target wasm32-unknown-unknown -p iroh-base --all-features
 
       - name: wasm32 build (iroh-relay)
-        run: cargo build --target wasm32-unknown-unknown -p iroh-relay --no-default-features
+        run: cargo build --target wasm32-unknown-unknown -p iroh-relay
 
       - name: wasm32 build (iroh)
-        run: cargo build --target wasm32-unknown-unknown -p iroh --no-default-features
+        run: cargo build --target wasm32-unknown-unknown -p iroh
 
       # If the Wasm file contains any 'import "env"' declarations, then
       # some non-Wasm-compatible code made it into the final code.
@@ -216,7 +216,7 @@ jobs:
           ! wasm-tools print --skeleton target/wasm32-unknown-unknown/debug/iroh.wasm | grep 'import "env"'
 
       - name: Run integration test in wasm
-        run: cargo test -p iroh --test integration --target=wasm32-unknown-unknown --no-default-features
+        run: cargo test -p iroh --test integration --target=wasm32-unknown-unknown
 
   check_semver:
     runs-on: ubuntu-latest
@@ -317,11 +317,13 @@ jobs:
       - uses: dtolnay/rust-toolchain@stable
       - name: Verify optional deps are absent without features
         run: |
-          tree=$(cargo tree -p iroh --no-default-features --edges normal)
           fail=0
-          for dep in portmapper igd-next swarm-discovery; do
-            if echo "$tree" | grep -q "$dep"; then
+          for dep in portmapper igd-next swarm-discovery ring aws-lc-rs; do
+            echo    "cargo tree -p iroh --no-default-features --edges normal --target all -i $dep";
+            output=$(cargo tree -p iroh --no-default-features --edges normal --target all -i "$dep" 2>&1) || true
+            if ! echo "$output" | grep -qE "(nothing to print|did not match any packages)"; then
               echo "ERROR: $dep should not be in the dependency tree without its feature"
+              echo "$output"
               fail=1
             fi
           done

.github/workflows/tests.yaml

@@ -221,6 +221,18 @@ jobs:
         with:
           release: false
 
+      - name: Install aws-lc-sys build dependencies
+        shell: powershell
+        run: |
+          $chocoPath = "$Env:ProgramData\chocolatey\bin\choco.exe"
+          if (!(Test-Path $chocoPath)) {
+            $chocoPath = "$Env:SystemDrive\ProgramData\chocolatey\bin\choco.exe"
+          }
+          & $chocoPath install cmake --installargs 'ADD_CMAKE_TO_PATH=System' -y
+          & $chocoPath install nasm -y
+          echo "C:\Program Files\CMake\bin" | Out-File -FilePath $Env:GITHUB_PATH -Encoding utf8 -Append
+          echo "C:\Program Files\NASM" | Out-File -FilePath $Env:GITHUB_PATH -Encoding utf8 -Append
+
       - name: build tests
         run: |
           cargo nextest run --workspace ${{ env.FEATURES }} --lib --bins --tests --target ${{ matrix.target }} --no-run
@@ -309,6 +321,18 @@ jobs:
         with:
           release: false
 
+      - name: Install aws-lc-sys build dependencies
+        shell: powershell
+        run: |
+          $chocoPath = "$Env:ProgramData\chocolatey\bin\choco.exe"
+          if (!(Test-Path $chocoPath)) {
+            $chocoPath = "$Env:SystemDrive\ProgramData\chocolatey\bin\choco.exe"
+          }
+          & $chocoPath install cmake --installargs 'ADD_CMAKE_TO_PATH=System' -y
+          & $chocoPath install nasm -y
+          echo "C:\Program Files\CMake\bin" | Out-File -FilePath $Env:GITHUB_PATH -Encoding utf8 -Append
+          echo "C:\Program Files\NASM" | Out-File -FilePath $Env:GITHUB_PATH -Encoding utf8 -Append
+
       - name: cargo check
         run: |
           rm -Force Cargo.lock