From 17aa3dcce79a5552af53cae895c0962913319388 Mon Sep 17 00:00:00 2001
From: paku <paku@skyizwhite.dev>
Date: Sun, 12 Jan 2025 12:42:20 +0900
Subject: [PATCH 1/3] Improve caching

---
 .forgejo/workflows/CI.yml | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/.forgejo/workflows/CI.yml b/.forgejo/workflows/CI.yml
index e523456..a4034c1 100644
--- a/.forgejo/workflows/CI.yml
+++ b/.forgejo/workflows/CI.yml
@@ -23,13 +23,15 @@ jobs:
         uses: actions/cache/restore@v4
         with:
           path: |
+            ~/.quicklisp-client-fix
+            ~/.roswell
             /usr/local/bin/ros
             /usr/local/etc/roswell/
-            ~/.roswell
-            ~/.config/common-lisp/source-registry.conf.d
-            ~/lisp
-            .qlot/
-          key: roswell-${{ runner.os }}-${{ matrix.lisp }}-${{ hashFiles('qlfile.lock', '.forgejo/workflows/CI.yml') }}
+            qlfile
+            qlfile.lock
+            .qlot
+            ~/.cache/common-lisp/
+          key: roswell-${{ runner.os }}-${{ matrix.lisp }}-${{ hashFiles('qlfile', 'qlfile.lock', '*.asd') }}
 
       - name: Install dependencies
         if: steps.restore-cache.outputs.cache-hit != 'true'
@@ -47,13 +49,15 @@ jobs:
         if: steps.restore-cache.outputs.cache-hit != 'true'
         with:
           path: |
+            ~/.quicklisp-client-fix
+            ~/.roswell
             /usr/local/bin/ros
             /usr/local/etc/roswell/
-            ~/.roswell
-            ~/.config/common-lisp/source-registry.conf.d
-            ~/lisp
-            .qlot/
+            qlfile
+            qlfile.lock
+            .qlot
+            ~/.cache/common-lisp/
           key: ${{ steps.restore-cache.outputs.cache-primary-key }}
 
       - name: Run tests
-        run: .qlot/bin/rove ningle-fbr.asd
\ No newline at end of file
+        run: .qlot/bin/rove ningle-fbr.asd
-- 
2.45.2


From 60731d33824ea6c0198a242faf1f0e00f2528957 Mon Sep 17 00:00:00 2001
From: paku <paku@skyizwhite.dev>
Date: Sun, 12 Jan 2025 13:04:27 +0900
Subject: [PATCH 2/3] fix

---
 .forgejo/workflows/{CI.yml => ci.yml} | 15 ++++++++++++---
 qlfile.lock                           |  2 +-
 2 files changed, 13 insertions(+), 4 deletions(-)
 rename .forgejo/workflows/{CI.yml => ci.yml} (82%)

diff --git a/.forgejo/workflows/CI.yml b/.forgejo/workflows/ci.yml
similarity index 82%
rename from .forgejo/workflows/CI.yml
rename to .forgejo/workflows/ci.yml
index a4034c1..2d886ec 100644
--- a/.forgejo/workflows/CI.yml
+++ b/.forgejo/workflows/ci.yml
@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      
+
       - name: Restore cache
         id: restore-cache
         uses: actions/cache/restore@v4
@@ -31,17 +31,26 @@ jobs:
             qlfile.lock
             .qlot
             ~/.cache/common-lisp/
-          key: roswell-${{ runner.os }}-${{ matrix.lisp }}-${{ hashFiles('qlfile', 'qlfile.lock', '*.asd') }}
+          key: roswell-${{ runner.os }}-${{ matrix.lisp }}-${{ hashFiles('qlfile', 'qlfile.lock', '*.asd', '.forgejo/workflows/ci.yml') }}
 
-      - name: Install dependencies
+      - name: Install Roswell
         if: steps.restore-cache.outputs.cache-hit != 'true'
         env:
           LISP: ${{ matrix.lisp }}
         run: |
           curl -L https://raw.githubusercontent.com/roswell/roswell/master/scripts/install-for-ci.sh | sh
+
+      - name: Install Qlot
+        if: steps.restore-cache.outputs.cache-hit != 'true'
+        run: |
           ros install fukamachi/qlot
+
+      - name: Install dependencies
+        if: steps.restore-cache.outputs.cache-hit != 'true'
+        run: |
           PATH="~/.roswell/bin:$PATH"
           qlot install
+          qlot exec ros install ningle-fbr
 
       - name: Save cache
         id: save-cache
diff --git a/qlfile.lock b/qlfile.lock
index a25f779..8b51a33 100644
--- a/qlfile.lock
+++ b/qlfile.lock
@@ -13,7 +13,7 @@
 ("cl-ppcre" .
  (:class qlot/source/ql:source-ql
   :initargs (:%version :latest)
-  :version "ql-2023-10-21"))
+  :version "ql-2023-06-18"))
 ("alexandria" .
  (:class qlot/source/ql:source-ql
   :initargs (:%version :latest)
-- 
2.45.2


From e3f47732579ade5a1295072d693ceb8dfb03769d Mon Sep 17 00:00:00 2001
From: paku <paku@skyizwhite.dev>
Date: Sun, 12 Jan 2025 13:07:52 +0900
Subject: [PATCH 3/3] Fix

---
 .github/workflows/CI.yml | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 5c662f5..675ae55 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -14,18 +14,16 @@ jobs:
       matrix:
         lisp:
           - sbcl-bin
+          - ccl-bin
+
+    env:
+      LISP: ${{ matrix.lisp }}
 
     steps:
       - uses: actions/checkout@v4
-
-      - name: Install dependencies
-        env:
-          LISP: ${{ matrix.lisp }}
-        run: |
-          curl -L https://raw.githubusercontent.com/roswell/roswell/master/scripts/install-for-ci.sh | sh
-          ros install fukamachi/qlot
-          PATH="~/.roswell/bin:$PATH"
-          qlot install
-
-      - name: Run tests
-        run: .qlot/bin/rove ningle-fbr.asd
+      - uses: 40ants/setup-lisp@v4
+        with:
+          asdf-system: ningle-fbr
+      - uses: 40ants/run-tests@v2
+        with:
+          asdf-system: ningle-fbr
\ No newline at end of file
-- 
2.45.2