From 50f7d4d7b98f995fed712b0128338e9e00532409 Mon Sep 17 00:00:00 2001
From: xinyangli <lixinyang411@gmail.com>
Date: Fri, 5 Apr 2024 11:30:52 +0800
Subject: [PATCH] ci: fix action cache

---
 .gitea/workflows/npc-test.yml | 12 +++++++++---
 flake.nix                     |  1 +
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.gitea/workflows/npc-test.yml b/.gitea/workflows/npc-test.yml
index a5652e4..e71108a 100644
--- a/.gitea/workflows/npc-test.yml
+++ b/.gitea/workflows/npc-test.yml
@@ -16,11 +16,13 @@ jobs:
         id: cache-nix-develop
         uses: actions/cache@v4
         with:
-          path: /nix/store
+          path: |
+            /nix/store
+            /nix/var/nix/db
           key: nix-develop-${{ hashFiles('flake.*') }}
       - name: Fetch nix store
         if: steps.cache-nix-develop.outputs.cache-hit != 'true'
-        run: nix develop .#npc
+        run: nix develop .#npc --command true
       - name: Use develop environment
         uses: https://git.xinyang.life/xin/nix-develop@main
         with:
@@ -29,7 +31,11 @@ jobs:
         id: cache-sbt-dependency
         uses: actions/cache@v4
         with:
-          path: npc/core
+          path: |
+            npc/core
+            ~/.cache/coursier
+            ~/.ivy2/cache
+            ~/.sbt
           key: core-${{ hashFiles('npc/core/build.sbt') }}
       - name: Fetch sbt dependencies
         if: steps.cache-sbt-dependency.outputs.cache-hit != 'true'
diff --git a/flake.nix b/flake.nix
index c5db1e6..b2e8142 100644
--- a/flake.nix
+++ b/flake.nix
@@ -49,6 +49,7 @@
             };
           };
         };
+
         packages.nemu = pkgs.callPackage ./nemu { am-kernels = self.packages.${system}.am-kernels; };
         packages.nemu-lib = pkgs.callPackage ./nemu { am-kernels = self.packages.${system}.am-kernels; defconfig = "riscv32-lib_defconfig"; };
         packages.abstract-machine = crossPkgs.callPackage ./abstract-machine { isa = "riscv"; platform = "nemu"; };