feat: Use upstream cargo-llvm-cov and add cachix

aftershootco · Nov 18, 2024 · bb42fef · bb42fef
1 parent bdcb002
commit bb42fef
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -17,7 +17,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: DeterminateSystems/nix-installer-action@main
-      - uses: DeterminateSystems/magic-nix-cache-action@main
       - id: set-matrix
         name: Generate Nix Matrix
         run: |
@@ -36,7 +35,10 @@ jobs:
           lfs: true
           submodules: 'recursive'
       - uses: DeterminateSystems/nix-installer-action@main
-      - uses: DeterminateSystems/magic-nix-cache-action@main
+      - uses: cachix/cachix-action@v14
+        with:
+          name: mnn-rs
+          authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
       - run: nix build -L '.#${{ matrix.attr }}'
 
   codecov:

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -65,10 +65,6 @@
                   lockFile = "${src}/Cargo.lock";
                 };
               };
-              cargo-llvm-cov = prev.cargo-llvm-cov.overrideAttrs (_: {
-                LLVM_COV = "${final.llvmPackages_19.llvm}/bin/llvm-cov";
-                LLVM_PROFDATA = "${final.llvmPackages_19.llvm}/bin/llvm-profdata";
-              });
             })
           ];
         };
@@ -222,6 +218,7 @@
                   git
                   git-lfs
                   llvm
+                  mnn
                   nushell
                   rust-bindgen
                   rustToolchainWithRustAnalyzer

diff --git a/mnn-sync/src/lib.rs b/mnn-sync/src/lib.rs
@@ -127,7 +127,7 @@ impl SessionRunnerState {
         tracing::info!("Unloading session");
         match core::mem::take(self) {
             Self::Loaded(sr) => {
-                let net = sr.unload()?;
+                let net = sr.unload();
                 *self = Self::Unloaded(net);
                 Ok(())
             }
@@ -221,11 +221,11 @@ impl SessionRunner {
         })
     }
 
-    pub fn unload(self) -> Result<mnn::Interpreter> {
+    pub fn unload(self) -> mnn::Interpreter {
         let session = self.session;
         let net = self.interpreter;
         drop(session);
-        Ok(net)
+        net
     }
 
     pub fn run_session(&mut self) -> Result<()> {