Merge pull request #29 from 40ants/reorganize-symbols

Reorganize symbols (attempt to fix tests)
40ants · Jun 19, 2024 · 58b7475 · 58b7475
2 parents cc8e1f5 + 7945161
commit 58b7475
Show file tree

Hide file tree

Showing 13 changed files with 98 additions and 253 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/README.md b/README.md
@@ -406,7 +406,7 @@ For example, this macro call:
 Will generate the whole bunch of classes and methods:
 
 ```
-(defclass petshop (jsonrpc/class:client) nil)
+(defclass petshop (jsonrpc/client:client) nil)
 
 (defun make-petshop () (make-instance 'petshop))
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,3 +2,4 @@ @@
     /env/
     /.qlot
     /.DS_Store
+    .*undo-tree*