From 8354054e78bd331ce839180065aa541f612a3075 Mon Sep 17 00:00:00 2001 From: Alexander Artemenko Date: Sat, 23 Oct 2021 10:11:52 +0300 Subject: [PATCH 1/2] Fixed the way of how a TOC is built. Previosly it incorrectly shown nested COMMONDOC:SECTION objects. --- src/changelog.lisp | 3 +++ src/commondoc/toc.lisp | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/changelog.lisp b/src/changelog.lisp index e9ea74f7..69e14028 100644 --- a/src/changelog.lisp +++ b/src/changelog.lisp @@ -133,6 +133,7 @@ "TOC" "SLIME" "SLY" + "COMMONDOC:SECTION" "COLLECT-REACHABLE-OBJECTS" "LOCATE-AND-COLLECT-REACHABLE-OBJECTS" "COMMONDOC-MARKDOWN:*MIN-LINK-HASH-LENGTH*" @@ -142,6 +143,8 @@ "*DOCUMENT-DOWNCASE-UPPERCASE-CODE*" ;; These objects are not documented yet: "40ANTS-DOC/COMMONDOC/XREF:XREF")) + (0.5.8 2021-10-23 + "* Fixed the way of how a TOC is built. Previosly it incorrectly shown nested COMMONDOC:SECTION objects.") (0.5.7 2021-10-21 "* DEFSECTION macro now supports EXTERNAL-DOCS argument.") (0.5.6 2021-10-21 diff --git a/src/commondoc/toc.lisp b/src/commondoc/toc.lisp index e6f4e487..168a8bc0 100644 --- a/src/commondoc/toc.lisp +++ b/src/commondoc/toc.lisp @@ -67,7 +67,7 @@ (40ants-doc/commondoc/changelog::changelog (setf inside-changelog t)) - (40ants-doc/commondoc/section:documentation-section + (common-doc:section (push (common-doc:make-unordered-list (list)) current-sublist) (setf (common-doc:children last-list-item) @@ -77,7 +77,7 @@ (typecase node (40ants-doc/commondoc/changelog::changelog (setf inside-changelog nil)) - (40ants-doc/commondoc/section:documentation-section + (common-doc:section (pop current-sublist))))) (40ants-doc/commondoc/mapper:map-nodes document #'collector :on-going-down #'on-down @@ -89,7 +89,7 @@ (setf (common-doc:children node) (loop for child in (common-doc:children node) unless (null (common-doc:children child)) - collect child))) + collect child))) node)) (40ants-doc/commondoc/mapper:map-nodes (car current-sublist) #'remove-empty-sublists)))) From c05b5beb4d4390191e5dfd0d5dc5426e416e216f Mon Sep 17 00:00:00 2001 From: Alexander Artemenko Date: Sun, 24 Oct 2021 13:44:54 +0300 Subject: [PATCH 2/2] Use fixed ASDF version in CI while issue in Roswell will not be fixed: https://github.com/roswell/roswell/issues/497 --- .github/workflows/ci.yml | 3 ++- .github/workflows/docs.yml | 3 ++- .github/workflows/linter.yml | 3 ++- src/ci.lisp | 12 ++++++++++-- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a13e3988..5f21db74 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,7 +30,8 @@ "name": "Setup Common Lisp Environment", "uses": "40ants/setup-lisp@v1", "with": { - "asdf-system": "40ants-doc-full" + "asdf-system": "40ants-doc-full", + "asdf-version": "3.3.5.1" } }, { diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index aab3a92b..39f4e659 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -25,7 +25,8 @@ "name": "Setup Common Lisp Environment", "uses": "40ants/setup-lisp@v1", "with": { - "asdf-system": "40ants-doc/doc" + "asdf-system": "40ants-doc/doc", + "asdf-version": "3.3.5.1" } }, { diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index 23d47b2f..ab0bb123 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -25,7 +25,8 @@ "name": "Setup Common Lisp Environment", "uses": "40ants/setup-lisp@v1", "with": { - "asdf-system": "40ants-doc/full" + "asdf-system": "40ants-doc/full", + "asdf-version": "3.3.5.1" } }, { diff --git a/src/ci.lisp b/src/ci.lisp index 4e6a0d8d..bdda3345 100644 --- a/src/ci.lisp +++ b/src/ci.lisp @@ -8,11 +8,17 @@ (in-package 40ants-doc/ci) +(defparameter *asdf-version* "3.3.5.1" + "At some point installation of the latest roswell version was broken: + https://github.com/roswell/roswell/issues/497") + + (defworkflow linter :on-push-to "master" :on-pull-request t :jobs ((40ants-ci/jobs/linter:linter - :asdf-systems ("40ants-doc/full")))) + :asdf-systems ("40ants-doc/full") + :asdf-version *asdf-version*))) (defworkflow ci @@ -21,6 +27,7 @@ :on-pull-request t :jobs ((40ants-ci/jobs/run-tests:run-tests :asdf-system "40ants-doc-full" + :asdf-version *asdf-version* :coverage t))) @@ -28,4 +35,5 @@ :on-push-to "master" :on-pull-request t :jobs ((40ants-ci/jobs/docs:build-docs - :asdf-system "40ants-doc/doc"))) + :asdf-system "40ants-doc/doc" + :asdf-version *asdf-version*)))