Merge 5fc0c34 into 91ed8a4

40ants · Apr 15, 2024 · dc5efaf · dc5efaf
2 parents 91ed8a4 + 5fc0c34
commit dc5efaf
Show file tree

Hide file tree

Showing 5 changed files with 132 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -51,7 +51,7 @@
         },
         {
           "name": "Run Linter",
-          "run": "qlot exec 40ants-linter --system \"40ants-asdf-system\"",
+          "run": "qlot exec 40ants-linter --system \"40ants-asdf-system, 40ants-asdf-system-docs, 40ants-asdf-system-tests\" --imports",
           "shell": "bash"
         }
       ]
@@ -64,13 +64,136 @@
             "ubuntu-latest",
             "macos-latest"
           ],
+          "exclude": [
+            {
+              "os": "ubuntu-latest",
+              "quicklisp": "ultralisp",
+              "lisp": "npt"
+            },
+            {
+              "os": "ubuntu-latest",
+              "quicklisp": "quicklisp",
+              "lisp": "npt"
+            },
+            {
+              "os": "ubuntu-latest",
+              "quicklisp": "quicklisp",
+              "lisp": "ccl-bin"
+            },
+            {
+              "os": "macos-latest",
+              "quicklisp": "quicklisp",
+              "lisp": "ccl-bin"
+            },
+            {
+              "os": "macos-latest",
+              "quicklisp": "ultralisp",
+              "lisp": "ccl-bin"
+            },
+            {
+              "os": "ubuntu-latest",
+              "quicklisp": "quicklisp",
+              "lisp": "abcl-bin"
+            },
+            {
+              "os": "macos-latest",
+              "quicklisp": "quicklisp",
+              "lisp": "abcl-bin"
+            },
+            {
+              "os": "macos-latest",
+              "quicklisp": "ultralisp",
+              "lisp": "abcl-bin"
+            },
+            {
+              "os": "ubuntu-latest",
+              "quicklisp": "quicklisp",
+              "lisp": "allegro"
+            },
+            {
+              "os": "macos-latest",
+              "quicklisp": "quicklisp",
+              "lisp": "allegro"
+            },
+            {
+              "os": "macos-latest",
+              "quicklisp": "ultralisp",
+              "lisp": "allegro"
+            },
+            {
+              "os": "ubuntu-latest",
+              "quicklisp": "quicklisp",
+              "lisp": "clasp"
+            },
+            {
+              "os": "macos-latest",
+              "quicklisp": "quicklisp",
+              "lisp": "clasp"
+            },
+            {
+              "os": "macos-latest",
+              "quicklisp": "ultralisp",
+              "lisp": "clasp"
+            },
+            {
+              "os": "ubuntu-latest",
+              "quicklisp": "quicklisp",
+              "lisp": "lispworks"
+            },
+            {
+              "os": "macos-latest",
+              "quicklisp": "quicklisp",
+              "lisp": "lispworks"
+            },
+            {
+              "os": "macos-latest",
+              "quicklisp": "ultralisp",
+              "lisp": "lispworks"
+            },
+            {
+              "os": "ubuntu-latest",
+              "quicklisp": "quicklisp",
+              "lisp": "mkcl"
+            },
+            {
+              "os": "macos-latest",
+              "quicklisp": "quicklisp",
+              "lisp": "mkcl"
+            },
+            {
+              "os": "macos-latest",
+              "quicklisp": "ultralisp",
+              "lisp": "mkcl"
+            },
+            {
+              "os": "ubuntu-latest",
+              "quicklisp": "quicklisp",
+              "lisp": "ecl"
+            },
+            {
+              "os": "macos-latest",
+              "quicklisp": "quicklisp",
+              "lisp": "ecl"
+            },
+            {
+              "os": "macos-latest",
+              "quicklisp": "ultralisp",
+              "lisp": "ecl"
+            }
+          ],
           "quicklisp": [
             "ultralisp",
             "quicklisp"
           ],
           "lisp": [
-            "sbcl",
-            "ccl",
+            "sbcl-bin",
+            "ccl-bin",
+            "abcl-bin",
+            "allegro",
+            "clasp",
+            "lispworks",
+            "mkcl",
+            "npt",
             "ecl"
           ]
         }

diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 *.fasl
 /docs/build/
 .qlot/
+/.DS_Store
diff --git a/40ants-asdf-system-ci.asd b/40ants-asdf-system-ci.asd
@@ -5,5 +5,5 @@
   :description "Provides CI configuration for 40ants-asdf-system."
   :bug-tracker "https://github.com/40ants/40ants-asdf-system/issues"
   :source-control (:git "https://github.com/40ants/40ants-asdf-system")
-  :pathname "ci"
+  :pathname "src"
   :depends-on ("40ants-asdf-system-ci/ci"))
diff --git a/qlfile.lock b/qlfile.lock
@@ -5,4 +5,4 @@
 ("ultralisp" .
  (:class qlot/source/dist:source-dist
   :initargs (:distribution "http://dist.ultralisp.org" :%version :latest)
-  :version "20240321213004"))
+  :version "20240415180501"))
diff --git a/src/ci.lisp b/src/ci.lisp
@@ -12,7 +12,7 @@
 
 (defparameter *lisp-implementations*
   (list "sbcl-bin"
-        "ccl-bin/1.12.1"
+        "ccl-bin"
         "abcl-bin"
         "allegro"
         "clasp"
@@ -29,7 +29,8 @@
   :by-cron "0 10 * * 1"
   :on-pull-request t
   :cache t
-  :jobs ((linter :asdf-systems ("40ants-asdf-system-docs"
+  :jobs ((linter :asdf-systems ("40ants-asdf-system"
+                                "40ants-asdf-system-docs"
                                 "40ants-asdf-system-tests")
                  :check-imports t)
          (run-tests