Merge remote-tracking branch 'origin/main' into feat/dns

n0-computer · Mar 18, 2024 · 785c79b · 785c79b
2 parents 1389d44 + 484e5e8
commit 785c79b
Show file tree

Hide file tree

Showing 67 changed files with 3,848 additions and 4,971 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -136,7 +136,7 @@ jobs:
 
     - name: Check MSRV all features
       run: |
-        cargo +$MSRV check --workspace --all-targets --features cli
+        cargo +$MSRV check --workspace --all-targets
 
   cargo_deny:
     timeout-minutes: 30

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -8,7 +8,8 @@ members = [
   "iroh-net",
   "iroh-sync",
   "iroh-test",
-  "iroh-net/bench"
+  "iroh-net/bench",
+  "iroh-cli"
 ]
 resolver = "2"