feat: Fix nightly builds and add to CI.

subconsciousnetwork · Oct 19, 2023 · f31e4a6 · f31e4a6
1 parent 9e5c83b
commit f31e4a6
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 12 deletions.
diff --git a/.github/workflows/run_test_suite.yaml b/.github/workflows/run_test_suite.yaml
@@ -61,31 +61,43 @@ jobs:
 
   run-linting-linux:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - toolchain: stable
+          - toolchain: nightly
     steps:
       - uses: actions/checkout@v3
       - uses: Swatinem/rust-cache@v2
       - name: 'Setup Rust'
         run: |
           curl -sSf https://sh.rustup.rs | sh -s -- -y
-          rustup component add clippy
-          rustup component add rustfmt
+          rustup toolchain install ${{matrix.toolchain}}
+          rustup +${{matrix.toolchain}} component add clippy
+          rustup +${{matrix.toolchain}} component add rustfmt
       - name: 'Install environment packages'
         run: |
           sudo apt-get update -qqy
           sudo apt-get install jq protobuf-compiler cmake
       - name: 'Check Format'
-        run: cargo fmt --all -- --check
+        run: cargo +${{matrix.toolchain}} fmt --all -- --check
       - name: 'Run Linter'
-        run: cargo clippy --all -- -D warnings
+        run: cargo +${{matrix.toolchain}} clippy --all -- -D warnings
 
   run-test-suite-linux:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - toolchain: stable
+          - toolchain: nightly
     steps:
       - uses: actions/checkout@v3
       - uses: Swatinem/rust-cache@v2
       - name: 'Setup Rust'
         run: |
           curl -sSf https://sh.rustup.rs | sh -s -- -y
+          rustup toolchain install ${{matrix.toolchain}}
       - name: 'Install environment packages'
         run: |
           sudo apt-get update -qqy
@@ -96,7 +108,7 @@ jobs:
           ipfs_version: v0.17.0
           run_daemon: true
       - name: 'Run Rust native target tests'
-        run: NOOSPHERE_LOG=deafening cargo test --features test-kubo,headers
+        run: NOOSPHERE_LOG=deafening cargo +${{matrix.toolchain}} test --features test-kubo,headers
 
   run-test-suite-linux-rocksdb:
     runs-on: ubuntu-latest

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/rust/noosphere-gateway/src/handlers/v0alpha2/push.rs b/rust/noosphere-gateway/src/handlers/v0alpha2/push.rs
@@ -50,7 +50,7 @@ pub async fn push_route<C, S>(
     stream: BodyStream,
 ) -> Result<StreamBody<impl Stream<Item = Result<Bytes, std::io::Error>>>, GatewayErrorResponse>
 where
-    C: HasMutableSphereContext<S>,
+    for<'a> C: HasMutableSphereContext<S> + 'a,
     S: Storage + 'static,
 {
     debug!("Invoking push route...");

diff --git a/rust/noosphere/Cargo.toml b/rust/noosphere/Cargo.toml
@@ -73,7 +73,7 @@ features = [
 ]
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-safer-ffi = { version = "0.1.2", features = ["proc_macros", "python-headers"] }
+safer-ffi = { git = "https://github.com/jsantell/safer_ffi", branch = "fix-190", features = ["proc_macros", "python-headers"] }
 tokio = { workspace = true, features = ["full"] }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]

diff --git a/rust/noosphere/src/ffi/mod.rs b/rust/noosphere/src/ffi/mod.rs
@@ -1,5 +1,5 @@
 // TODO(getditto/safer_ffi#181): Re-enable this lint
-#![allow(clippy::incorrect_clone_impl_on_copy_type, non_snake_case)]
+#![allow(clippy::non_canonical_clone_impl, non_snake_case)]
 
 //! This module defins a C FFI for Noosphere, suitable for cross-language
 //! embedding on many different targets