Move from mgl-pax to 40ants-doc.

40ants · Apr 22, 2021 · f187da3 · f187da3
1 parent 95aaaa4
commit f187da3
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 26 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -43,7 +43,7 @@
           "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') }}"
+            "key": "${{ steps.current-month.outputs.value }}-${{ env.cache-name }}-ubuntu-latest-quicklisp-sbcl-bin-${{ hashFiles('qlfile.lock', '*.asd') }}"
           }
         },
         {
@@ -62,12 +62,12 @@
         },
         {
           "name": "Install SBLint",
-          "run": "qlot exec ros install cxxxr/sblint",
+          "run": "\necho 'dist ultralisp http://dist.ultralisp.org' > qlfile\nqlot update\nqlot exec ros install 40ants-linter\n",
           "shell": "bash"
         },
         {
           "name": "Run Linter",
-          "run": "qlot exec sblint cl-info.asd",
+          "run": "qlot exec 40ants-linter --system \"cl-info\"",
           "shell": "bash"
         }
       ]
@@ -150,7 +150,7 @@
           "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 }}-${{ matrix.os }}-${{ matrix.quicklisp }}-${{ matrix.lisp }}-${{ hashFiles('qlfile.lock') }}"
+            "key": "${{ steps.current-month.outputs.value }}-${{ env.cache-name }}-${{ matrix.os }}-${{ matrix.quicklisp }}-${{ matrix.lisp }}-${{ hashFiles('qlfile.lock', '*.asd') }}"
           }
         },
         {
@@ -164,7 +164,7 @@
           "uses": "40ants/setup-lisp@v1",
           "with": {
             "asdf-system": "cl-info",
-            "qlfile-template": "{% ifequal quicklisp_dist \"ultralisp\" %}\ndist ultralisp http://dist.ultralisp.org\n{% endifequal %}\n\ngithub mgl-pax svetlyak40wt/mgl-pax :branch mgl-pax-minimal"
+            "qlfile-template": "{% ifequal quicklisp_dist \"ultralisp\" %}\ndist ultralisp http://dist.ultralisp.org\n{% endifequal %}"
           },
           "if": "steps.cache.outputs.cache-hit != 'true'"
         },
@@ -184,4 +184,4 @@
       ]
     }
   }
-}
+}
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -42,7 +42,7 @@
           "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') }}"
+            "key": "${{ steps.current-month.outputs.value }}-${{ env.cache-name }}-ubuntu-latest-quicklisp-sbcl-bin-${{ hashFiles('qlfile.lock', '*.asd') }}"
           }
         },
         {
@@ -55,19 +55,19 @@
           "name": "Setup Common Lisp Environment",
           "uses": "40ants/setup-lisp@v1",
           "with": {
-            "asdf-system": "cl-info",
-            "qlfile-template": "github mgl-pax svetlyak40wt/mgl-pax :branch mgl-pax-minimal"
+            "asdf-system": "cl-info"
           },
           "if": "steps.cache.outputs.cache-hit != 'true'"
         },
         {
           "name": "Build Docs",
           "uses": "40ants/build-docs@v1",
           "with": {
-            "asdf-system": "cl-info"
+            "asdf-system": "cl-info",
+            "error-on-warnings": true
           }
         }
       ]
     }
   }
-}
+}
diff --git a/qlfile b/qlfile
@@ -3,6 +3,3 @@ dist ultralisp http://dist.ultralisp.org
 # Unless this pull will be merged:
 # https://github.com/sionescu/bordeaux-threads/pull/86
 github bordeaux-threads svetlyak40wt/bordeaux-threads :branch fix-apiv2-for-no-threads
-
-# Unless this patch is not merged:
-github mgl-pax svetlyak40wt/mgl-pax :branch mgl-pax-minimal
diff --git a/qlfile.lock b/qlfile.lock
@@ -1,16 +1,12 @@
 ("quicklisp" .
  (:class qlot/source/dist:source-dist
   :initargs (:distribution "http://beta.quicklisp.org/dist/quicklisp.txt" :%version :latest)
-  :version "2021-01-24"))
+  :version "2021-04-11"))
 ("ultralisp" .
  (:class qlot/source/dist:source-dist
   :initargs (:distribution "http://dist.ultralisp.org" :%version :latest)
-  :version "20210225103501"))
+  :version "20210422062000"))
 ("bordeaux-threads" .
  (:class qlot/source/github:source-github
   :initargs (:repos "svetlyak40wt/bordeaux-threads" :ref nil :branch "fix-apiv2-for-no-threads" :tag nil)
   :version "github-c5ed58df63356d7e2892b54cbd9dd7da"))
-("mgl-pax" .
- (:class qlot/source/github:source-github
-  :initargs (:repos "svetlyak40wt/mgl-pax" :ref nil :branch "mgl-pax-minimal" :tag nil)
-  :version "github-6c4eecc1be34466756e6096d1c5071f5"))
diff --git a/src/ci.lisp b/src/ci.lisp
@@ -83,6 +83,4 @@
           :coverage t
           :qlfile "{% ifequal quicklisp_dist \"ultralisp\" %}
                    dist ultralisp http://dist.ultralisp.org
-                   {% endifequal %}
-
-                   github mgl-pax svetlyak40wt/mgl-pax :branch mgl-pax-minimal")))
+                   {% endifequal %}")))
diff --git a/src/core.lisp b/src/core.lisp
@@ -1,9 +1,8 @@
 (uiop:define-package #:cl-info
    (:nicknames #:cl-info/core)
    (:use #:cl)
-   (:import-from #:mgl-pax-minimal
-                 #:defsection
-                 #:reader)
+   (:import-from #:40ants-doc
+                 #:defsection)
    (:export #:cl-info
             #:get-cl-info
             #:get-system-info