Use magic nix cache and nix develop command in CI

staticweb-io · Dec 28, 2023 · 6083c87 · 6083c87
1 parent 3f58dff
commit 6083c87
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 23 deletions.
diff --git a/.github/workflows/test-and-release.yml b/.github/workflows/test-and-release.yml
@@ -12,24 +12,26 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/cache@v3
-        id: cache
+      - name: Install Nix
+        uses: DeterminateSystems/nix-installer-action@v9
+
+      - name: Run the Magic Nix Cache
+        uses: DeterminateSystems/magic-nix-cache-action@v2
+
+      - name: Cache Clojure dependencies
+        uses: actions/cache@v3
         with:
-          key: ${{ runner.os }}-rate-limit-${{ hashFiles('**/deps.edn') }}
-          restore-keys: ${{ runner.os }}-rate-limit
+          key: clj-${{ github.repository }}-${{ hashFiles('**/deps.edn') }}
+          restore-keys: clj-${{ github.repository }}-
           path: |
             ~/.gitlibs
-            ~/.m2
-
-      - name: Install Nix
-        uses: cachix/install-nix-action@v24
-
-      - run: nix-build
+            ~/.m2/repository
 
-      - run: nix-shell --run "clj -T:build ci :snapshot false"
+      - name: Run tests
+        run: nix develop -c clj -T:build ci :snapshot false
 
       - name: Deploy release jar
-        run: nix-shell --run "clojure -T:build deploy :snapshot false"
+        run: nix develop -c clojure -T:build deploy :snapshot false
         env:
           CLOJARS_PASSWORD: ${{secrets.CLOJARS_PASSWORD}}
           CLOJARS_USERNAME: ${{secrets.CLOJARS_USERNAME}}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -15,18 +15,20 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/cache@v3
-        id: cache
+      - name: Install Nix
+        uses: DeterminateSystems/nix-installer-action@v9
+
+      - name: Run the Magic Nix Cache
+        uses: DeterminateSystems/magic-nix-cache-action@v2
+
+      - name: Cache Clojure dependencies
+        uses: actions/cache@v3
         with:
-          key: ${{ runner.os }}-rate-limit-${{ hashFiles('**/deps.edn') }}
-          restore-keys: ${{ runner.os }}-rate-limit
+          key: clj-${{ github.repository }}-${{ hashFiles('**/deps.edn') }}
+          restore-keys: clj-${{ github.repository }}-
           path: |
             ~/.gitlibs
-            ~/.m2
-
-      - name: Install Nix
-        uses: cachix/install-nix-action@v24
-
-      - run: nix-build
+            ~/.m2/repository
 
-      - run: nix-shell --run "clj -T:build ci :snapshot true"
+      - name: Run tests
+        run: nix develop -c clj -T:build ci :snapshot true