Update qlfile.lock and fix CI pipeline.

40ants · Jun 19, 2024 · 7945161 · 7945161
1 parent 0bc1904
commit 7945161
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 218 deletions.
diff --git a/.github/workflows/client-ci.yml b/.github/workflows/client-ci.yml
@@ -24,41 +24,15 @@
       "steps": [
         {
           "name": "Checkout Code",
-          "uses": "actions/checkout@v3"
-        },
-        {
-          "name": "Grant All Perms to Make Cache Restoring Possible",
-          "run": "sudo mkdir -p /usr/local/etc/roswell\n                 sudo chown \"${USER}\" /usr/local/etc/roswell\n                 # Here the ros binary will be restored:\n                 sudo chown \"${USER}\" /usr/local/bin",
-          "shell": "bash"
-        },
-        {
-          "name": "Get Current Month",
-          "id": "current-month",
-          "run": "echo \"value=$(date -u \"+%Y-%m\")\" >> $GITHUB_OUTPUT",
-          "shell": "bash"
-        },
-        {
-          "name": "Cache Roswell Setup",
-          "id": "cache",
-          "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 }}-ubuntu-latest-quicklisp-sbcl-bin-${{ hashFiles('qlfile.lock', '*.asd') }}"
-          }
-        },
-        {
-          "name": "Restore Path To Cached Files",
-          "run": "echo $HOME/.roswell/bin >> $GITHUB_PATH\n                 echo .qlot/bin >> $GITHUB_PATH",
-          "shell": "bash",
-          "if": "steps.cache.outputs.cache-hit == 'true'"
+          "uses": "actions/checkout@v4"
         },
         {
           "name": "Setup Common Lisp Environment",
-          "uses": "40ants/setup-lisp@v2",
+          "uses": "40ants/setup-lisp@v4",
           "with": {
-            "asdf-system": "openrpc-client"
-          },
-          "if": "steps.cache.outputs.cache-hit != 'true'"
+            "asdf-system": "openrpc-client",
+            "cache": "true"
+          }
         },
         {
           "name": "Change dist to Ultralisp if qlfile does not exist",

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
diff --git a/.github/workflows/server-ci.yml b/.github/workflows/server-ci.yml
@@ -24,41 +24,15 @@
       "steps": [
         {
           "name": "Checkout Code",
-          "uses": "actions/checkout@v3"
-        },
-        {
-          "name": "Grant All Perms to Make Cache Restoring Possible",
-          "run": "sudo mkdir -p /usr/local/etc/roswell\n                 sudo chown \"${USER}\" /usr/local/etc/roswell\n                 # Here the ros binary will be restored:\n                 sudo chown \"${USER}\" /usr/local/bin",
-          "shell": "bash"
-        },
-        {
-          "name": "Get Current Month",
-          "id": "current-month",
-          "run": "echo \"value=$(date -u \"+%Y-%m\")\" >> $GITHUB_OUTPUT",
-          "shell": "bash"
-        },
-        {
-          "name": "Cache Roswell Setup",
-          "id": "cache",
-          "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 }}-ubuntu-latest-quicklisp-sbcl-bin-${{ hashFiles('qlfile.lock', '*.asd') }}"
-          }
-        },
-        {
-          "name": "Restore Path To Cached Files",
-          "run": "echo $HOME/.roswell/bin >> $GITHUB_PATH\n                 echo .qlot/bin >> $GITHUB_PATH",
-          "shell": "bash",
-          "if": "steps.cache.outputs.cache-hit == 'true'"
+          "uses": "actions/checkout@v4"
         },
         {
           "name": "Setup Common Lisp Environment",
-          "uses": "40ants/setup-lisp@v2",
+          "uses": "40ants/setup-lisp@v4",
           "with": {
-            "asdf-system": "openrpc-server"
-          },
-          "if": "steps.cache.outputs.cache-hit != 'true'"
+            "asdf-system": "openrpc-server",
+            "cache": "true"
+          }
         },
         {
           "name": "Change dist to Ultralisp if qlfile does not exist",
@@ -88,71 +62,29 @@
         "matrix": {
           "os": [
             "ubuntu-latest",
-            "macos-latest"
-          ],
-          "exclude": [
-            {
-              "os": "macos-latest",
-              "lisp": "clisp"
-            },
-            {
-              "os": "macos-latest",
-              "lisp": "ecl"
-            }
-          ],
-          "lisp": [
-            "sbcl-bin",
-            "ccl-bin/1.12.1",
-            "clisp",
-            "ecl"
+            "macos-13"
           ]
         }
       },
       "runs-on": "${{ matrix.os }}",
       "env": {
         "OS": "${{ matrix.os }}",
         "QUICKLISP_DIST": "ultralisp",
-        "LISP": "${{ matrix.lisp }}"
+        "LISP": "sbcl-bin"
       },
       "steps": [
         {
           "name": "Checkout Code",
-          "uses": "actions/checkout@v3"
-        },
-        {
-          "name": "Grant All Perms to Make Cache Restoring Possible",
-          "run": "sudo mkdir -p /usr/local/etc/roswell\n                 sudo chown \"${USER}\" /usr/local/etc/roswell\n                 # Here the ros binary will be restored:\n                 sudo chown \"${USER}\" /usr/local/bin",
-          "shell": "bash"
-        },
-        {
-          "name": "Get Current Month",
-          "id": "current-month",
-          "run": "echo \"value=$(date -u \"+%Y-%m\")\" >> $GITHUB_OUTPUT",
-          "shell": "bash"
-        },
-        {
-          "name": "Cache Roswell Setup",
-          "id": "cache",
-          "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-${{ matrix.lisp }}-${{ hashFiles('qlfile.lock', '*.asd') }}"
-          }
-        },
-        {
-          "name": "Restore Path To Cached Files",
-          "run": "echo $HOME/.roswell/bin >> $GITHUB_PATH\n                 echo .qlot/bin >> $GITHUB_PATH",
-          "shell": "bash",
-          "if": "steps.cache.outputs.cache-hit == 'true'"
+          "uses": "actions/checkout@v4"
         },
         {
           "name": "Setup Common Lisp Environment",
-          "uses": "40ants/setup-lisp@v2",
+          "uses": "40ants/setup-lisp@v4",
           "with": {
             "asdf-system": "openrpc-server",
-            "qlfile-template": "{% ifequal quicklisp_dist \"ultralisp\" %}\ndist ultralisp http://dist.ultralisp.org\n{% endifequal %}"
-          },
-          "if": "steps.cache.outputs.cache-hit != 'true'"
+            "qlfile-template": "{% ifequal env.quicklisp_dist \"ultralisp\" %}\ndist ultralisp http://dist.ultralisp.org\n{% endifequal %}",
+            "cache": "true"
+          }
         },
         {
           "name": "Run Tests",

diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@
 /env/
 /.qlot
 /.DS_Store
+.*undo-tree*
diff --git a/openrpc-deps.asd b/openrpc-deps.asd
@@ -0,0 +1,2 @@
+(defsystem "openrpc-deps"
+  :depends-on ("jsonrpc"))
diff --git a/openrpc-server.asd b/openrpc-server.asd
@@ -5,7 +5,10 @@
   :class :40ants-asdf-system
   :defsystem-depends-on ("40ants-asdf-system")
   :pathname "server"
-  :depends-on ("openrpc-server/server"
+  :serial t
+  :depends-on ("log4cl-extras"
+               ;; "jsonrpc"
+               "openrpc-server/server"
                "openrpc-server/class"
                "openrpc-server/discovery")
   :description "OpenRPC server implementation for Common Lisp."

diff --git a/qlfile.lock b/qlfile.lock
@@ -1,8 +1,8 @@
 ("quicklisp" .
  (:class qlot/source/dist:source-dist
-  :initargs (:distribution "http://beta.quicklisp.org/dist/quicklisp.txt" :%version :latest)
+  :initargs (:distribution "https://beta.quicklisp.org/dist/quicklisp.txt" :%version :latest)
   :version "2023-10-21"))
 ("ultralisp" .
  (:class qlot/source/dist:source-dist
-  :initargs (:distribution "http://dist.ultralisp.org" :%version :latest)
-  :version "20240303155001"))
+  :initargs (:distribution "https://dist.ultralisp.org" :%version :latest)
+  :version "20240618125502"))
diff --git a/server/ci.lisp b/server/ci.lisp
@@ -22,26 +22,28 @@
   :jobs ((40ants-ci/jobs/linter:linter :check-imports t)
          (run-tests
           :os ("ubuntu-latest"
-               "macos-latest")
+               "macos-13")
           :quicklisp (;; Quicklisp is not working yet, because
-                      ;; there is old JSONRPC where no "jsonrpc/transport/http" system. 
+                      ;; there is old JSONRPC where no "jsonrpc/server" system. 
                       ;; "quicklisp"
                       "ultralisp")
           :lisp ("sbcl-bin"
-                 ;; On CCL there are some strange network errors both on ubuntu and OSX
-                 "ccl-bin/1.12.1"
-                 "clisp"
-                 "ecl")
-          :exclude (
-                    ;; For some reason CLISP of OSX does not support threading
-                    ;; and bordeaux-threads fails to compile
-                    (:os "macos-latest" 
-                     :lisp "clisp")
-                    ;; ECL on OSX fails to compile prometheus-gc/sbcl
-                    (:os "macos-latest" 
-                     :lisp "ecl"))
+                 ;; If somebody cares about these or other implementations
+                 ;; you can join as a maintainer:
+                 ;; "ccl-bin"
+                 ;; "clisp"
+                 ;; "ecl"
+                 )
+          ;; :exclude (
+          ;;           ;; For some reason CLISP of OSX does not support threading
+          ;;           ;; and bordeaux-threads fails to compile
+          ;;           (:os "macos-13" 
+          ;;            :lisp "clisp")
+          ;;           ;; ECL on OSX fails to compile prometheus-gc/sbcl
+          ;;           (:os "macos-13" 
+          ;;            :lisp "ecl"))
           :coverage t
-          :qlfile "{% ifequal quicklisp_dist \"ultralisp\" %}
+          :qlfile "{% ifequal env.quicklisp_dist \"ultralisp\" %}
                    dist ultralisp http://dist.ultralisp.org
                    {% endifequal %}")))
 
diff --git a/server/clack.lisp b/server/clack.lisp
@@ -3,6 +3,7 @@
   (:import-from #:jsonrpc)
   (:import-from #:yason)
   (:import-from #:lack.request)
+  (:import-from #:jsonrpc)
   (:import-from #:jsonrpc/server
                 #:bind-server-to-transport)
   (:import-from #:jsonrpc/transport/websocket
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,3 +2,4 @@ @@
     /env/
     /.qlot
     /.DS_Store
+    .*undo-tree*
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		(defsystem "openrpc-deps"
		:depends-on ("jsonrpc"))