Merge c9fd422 into 59d3f1d

40ants · Mar 8, 2024 · f0f94b8 · f0f94b8
2 parents 59d3f1d + c9fd422
commit f0f94b8
Show file tree

Hide file tree

Showing 3 changed files with 89 additions and 82 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -6,10 +6,15 @@
         "master"
       ]
     },
-    "pull_request": null
+    "pull_request": null,
+    "schedule": [
+      {
+        "cron": "0 10 * * 1"
+      }
+    ]
   },
   "jobs": {
-    "test-on-sbcl": {
+    "linter": {
       "runs-on": "ubuntu-latest",
       "env": {
         "OS": "ubuntu-latest",
@@ -19,86 +24,114 @@
       "steps": [
         {
           "name": "Checkout Code",
-          "uses": "actions/checkout@v1"
+          "uses": "actions/checkout@v4"
         },
         {
           "name": "Setup Common Lisp Environment",
-          "uses": "40ants/setup-lisp@v2",
+          "uses": "40ants/setup-lisp@v4",
           "with": {
-            "asdf-system": "cl-info"
+            "asdf-system": "cl-info",
+            "cache": "true"
           }
         },
         {
-          "name": "Run Tests",
-          "uses": "40ants/run-tests@v2",
-          "with": {
-            "asdf-system": "cl-info"
-          }
-        },
-        {
-          "name": "Run Command Line Version",
-          "run": "echo ::group::Help Argument\nqlot exec cl-info --help\necho ::endgroup::\necho ::group::Version Argument\nqlot exec cl-info --version\necho ::endgroup::\necho ::group::Lisp Systems Info\nqlot exec cl-info cl-info defmain\necho ::endgroup::\n",
+          "name": "Change dist to Ultralisp if qlfile does not exist",
+          "run": "if [[ ! -e qlfile ]]; then echo 'dist ultralisp http://dist.ultralisp.org' > qlfile; fi",
           "shell": "bash"
-        }
-      ]
-    },
-    "test-on-ccl": {
-      "runs-on": "ubuntu-latest",
-      "env": {
-        "OS": "ubuntu-latest",
-        "QUICKLISP_DIST": "quicklisp",
-        "LISP": "ccl-bin"
-      },
-      "steps": [
-        {
-          "name": "Checkout Code",
-          "uses": "actions/checkout@v1"
         },
         {
-          "name": "Setup Common Lisp Environment",
-          "uses": "40ants/setup-lisp@v2",
-          "with": {
-            "asdf-system": "cl-info"
-          }
+          "name": "Update Qlot",
+          "run": "qlot update --no-deps",
+          "shell": "bash"
         },
         {
-          "name": "Run Tests",
-          "uses": "40ants/run-tests@v2",
-          "with": {
-            "asdf-system": "cl-info"
-          }
+          "name": "Install SBLint wrapper",
+          "run": "qlot exec ros install 40ants-asdf-system 40ants-linter",
+          "shell": "bash"
         },
         {
-          "name": "Run Command Line Version",
-          "run": "echo ::group::Help Argument\nqlot exec cl-info --help\necho ::endgroup::\necho ::group::Version Argument\nqlot exec cl-info --version\necho ::endgroup::\necho ::group::Lisp Systems Info\nqlot exec cl-info cl-info defmain\necho ::endgroup::\n",
+          "name": "Run Linter",
+          "run": "qlot exec 40ants-linter --system \"cl-info\"",
           "shell": "bash"
         }
       ]
     },
-    "test-on-allegro": {
-      "runs-on": "ubuntu-latest",
+    "run-tests": {
+      "strategy": {
+        "fail-fast": false,
+        "matrix": {
+          "os": [
+            "ubuntu-latest",
+            "macos-latest"
+          ],
+          "exclude": [
+            {
+              "os": "macos-latest",
+              "lisp": "allegro"
+            },
+            {
+              "os": "macos-latest",
+              "quicklisp": "ultralisp",
+              "lisp": "clisp"
+            },
+            {
+              "os": "macos-latest",
+              "lisp": "cmucl"
+            },
+            {
+              "os": "ubuntu-latest",
+              "lisp": "clisp"
+            },
+            {
+              "os": "ubuntu-latest",
+              "lisp": "allegro"
+            },
+            {
+              "os": "ubuntu-latest",
+              "lisp": "cmucl"
+            }
+          ],
+          "quicklisp": [
+            "quicklisp",
+            "ultralisp"
+          ],
+          "lisp": [
+            "sbcl-bin",
+            "ccl-bin",
+            "allegro",
+            "ecl",
+            "allegro",
+            "clisp",
+            "cmucl"
+          ]
+        }
+      },
+      "runs-on": "${{ matrix.os }}",
       "env": {
-        "OS": "ubuntu-latest",
-        "QUICKLISP_DIST": "quicklisp",
-        "LISP": "allegro"
+        "OS": "${{ matrix.os }}",
+        "QUICKLISP_DIST": "${{ matrix.quicklisp }}",
+        "LISP": "${{ matrix.lisp }}"
       },
       "steps": [
         {
           "name": "Checkout Code",
-          "uses": "actions/checkout@v1"
+          "uses": "actions/checkout@v4"
         },
         {
           "name": "Setup Common Lisp Environment",
-          "uses": "40ants/setup-lisp@v2",
+          "uses": "40ants/setup-lisp@v4",
           "with": {
-            "asdf-system": "cl-info"
+            "asdf-system": "cl-info",
+            "qlfile-template": "{% ifequal quicklisp_dist \"ultralisp\" %}\ndist ultralisp http://dist.ultralisp.org\n{% endifequal %}",
+            "cache": "true"
           }
         },
         {
           "name": "Run Tests",
           "uses": "40ants/run-tests@v2",
           "with": {
-            "asdf-system": "cl-info"
+            "asdf-system": "cl-info",
+            "coveralls-token": "\n${{ matrix.lisp == 'sbcl-bin' &&\n    matrix.os == 'ubuntu-latest' &&\n    matrix.quicklisp == 'ultralisp' &&\n    secrets.github_token }}"
           }
         },
         {

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -23,41 +23,15 @@
       "steps": [
         {
           "name": "Checkout Code",
-          "uses": "actions/checkout@v1"
-        },
-        {
-          "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 \"::set-output name=value::$(date -u \"+%Y-%m\")\"",
-          "shell": "bash"
-        },
-        {
-          "name": "Cache Roswell Setup",
-          "id": "cache",
-          "uses": "actions/cache@v2",
-          "with": {
-            "path": "qlfile\n                           qlfile.lock\n                           /usr/local/bin/ros\n                           ~/.cache/common-lisp/\n                           ~/.roswell\n                           /usr/local/etc/roswell\n                           .qlot",
-            "key": "${{ 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": "cl-info"
-          },
-          "if": "steps.cache.outputs.cache-hit != 'true'"
+            "asdf-system": "cl-info",
+            "cache": "true"
+          }
         },
         {
           "name": "Build Docs",

diff --git a/qlfile.lock b/qlfile.lock
@@ -1,11 +1,11 @@
 ("quicklisp" .
  (:class qlot/source/dist:source-dist
   :initargs (:distribution "http://beta.quicklisp.org/dist/quicklisp.txt" :%version :latest)
-  :version "2021-12-30"))
+  :version "2023-10-21"))
 ("ultralisp" .
  (:class qlot/source/dist:source-dist
   :initargs (:distribution "http://dist.ultralisp.org" :%version :latest)
-  :version "20220128163500"))
+  :version "20240308123500"))
 ("bordeaux-threads" .
  (:class qlot/source/github:source-github
   :initargs (:repos "svetlyak40wt/bordeaux-threads" :ref nil :branch "fix-apiv2-for-no-threads" :tag nil)