Merge branch 'libp2p-next' into refactor/remove-redundant

dariusc93 · Jul 4, 2024 · 5734972 · 5734972
2 parents bda6198 + ef7e368
commit 5734972
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 17 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -0,0 +1,32 @@
+name: Checks
+
+on:
+  push:
+    branches: [ "libp2p-next" ]
+  pull_request:
+    branches: [ "libp2p-next" ]
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  check-native:
+    runs-on: ubuntu-latest
+    steps:    
+    - name: Check (native)
+    - uses: actions/checkout@v4
+    - uses: dtolnay/rust-toolchain@master
+      with:
+        toolchain: stable
+    - run: cargo check
+
+  check-wasm:
+    runs-on: ubuntu-latest
+    steps:    
+    - name: Check (native)
+    - uses: actions/checkout@v4
+    - uses: dtolnay/rust-toolchain@master
+      with:
+        toolchain: stable
+        target: wasm32-unknown-unknown
+    - run: cargo check --target wasm32-unknown-unknown
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/unixfs/Cargo.toml b/unixfs/Cargo.toml
@@ -13,7 +13,7 @@ default = ["filetime"]
 
 [dependencies]
 libipld = "0.16"
-either = { default-features = false, version = "1.8" }
+either = { default-features = false, version = "1.13" }
 filetime = { optional = true, version = "0.2" }
 quick-protobuf = { default-features = false, features = [
     "std",