Updated CI file to use clack from quicklisp.

40ants · Sep 22, 2023 · d7d1aea · d7d1aea
1 parent 4fd7e3e
commit d7d1aea
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/.github/workflows/server-ci.yml b/.github/workflows/server-ci.yml
@@ -89,13 +89,17 @@
           "os": [
             "ubuntu-latest",
             "macos-latest"
+          ],
+          "quicklisp": [
+            "quicklisp",
+            "ultralisp"
           ]
         }
       },
       "runs-on": "${{ matrix.os }}",
       "env": {
         "OS": "${{ matrix.os }}",
-        "QUICKLISP_DIST": "ultralisp",
+        "QUICKLISP_DIST": "${{ matrix.quicklisp }}",
         "LISP": "sbcl-bin"
       },
       "steps": [
@@ -120,7 +124,7 @@
           "uses": "actions/cache@v3",
           "with": {
             "path": "qlfile\nqlfile.lock\n~/.cache/common-lisp/\n~/.roswell\n/usr/local/etc/roswell\n/usr/local/bin/ros\n/usr/local/Cellar/roswell\n.qlot",
-            "key": "a-${{ steps.current-month.outputs.value }}-${{ env.cache-name }}-${{ matrix.os }}-ultralisp-sbcl-bin-${{ hashFiles('qlfile.lock', '*.asd') }}"
+            "key": "a-${{ steps.current-month.outputs.value }}-${{ env.cache-name }}-${{ matrix.os }}-${{ matrix.quicklisp }}-sbcl-bin-${{ hashFiles('qlfile.lock', '*.asd') }}"
           }
         },
         {
@@ -134,7 +138,7 @@
           "uses": "40ants/setup-lisp@v2",
           "with": {
             "asdf-system": "openrpc-server",
-            "qlfile-template": "{% ifequal quicklisp_dist \"ultralisp\" %}\ndist ultralisp http://dist.ultralisp.org\n{% endifequal %}"
+            "qlfile-template": "{% ifequal quicklisp_dist \"ultralisp\" %}\ndist ultralisp http://dist.ultralisp.org\nql clack\n{% endifequal %}"
           },
           "if": "steps.cache.outputs.cache-hit != 'true'"
         },

diff --git a/server/ci.lisp b/server/ci.lisp
@@ -25,7 +25,7 @@
                "macos-latest")
           :quicklisp (;; Quicklisp is not working yet, because
                       ;; there is old JSONRPC where no "jsonrpc/transport/http" system. 
-                      ;; "quicklisp"
+                      "quicklisp"
                       "ultralisp")
           :lisp ("sbcl-bin"
                  ;; On CCL there are some strange network errors both on ubuntu and OSX
@@ -38,5 +38,6 @@
           :coverage t
           :qlfile "{% ifequal quicklisp_dist \"ultralisp\" %}
                    dist ultralisp http://dist.ultralisp.org
+                   ql clack
                    {% endifequal %}")))