Skip to content

Commit

Permalink
Imports were fixed and now linted on PR.
Browse files Browse the repository at this point in the history
  • Loading branch information
svetlyak40wt committed Nov 14, 2022
1 parent 615523d commit 0495f8a
Show file tree
Hide file tree
Showing 13 changed files with 40 additions and 28 deletions.
7 changes: 3 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,13 @@
"steps": [
{
"name": "Checkout Code",
"uses": "actions/checkout@v1"
"uses": "actions/checkout@v3"
},
{
"name": "Setup Common Lisp Environment",
"uses": "40ants/setup-lisp@v1",
"uses": "40ants/setup-lisp@v2",
"with": {
"asdf-system": "40ants-doc-full",
"asdf-version": "3.3.5.1"
"asdf-system": "40ants-doc-full"
}
},
{
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,13 @@
"steps": [
{
"name": "Checkout Code",
"uses": "actions/checkout@v1"
"uses": "actions/checkout@v3"
},
{
"name": "Setup Common Lisp Environment",
"uses": "40ants/setup-lisp@v1",
"uses": "40ants/setup-lisp@v2",
"with": {
"asdf-system": "40ants-doc/doc",
"asdf-version": "3.3.5.1"
"asdf-system": "40ants-doc/doc"
}
},
{
Expand Down
11 changes: 5 additions & 6 deletions .github/workflows/linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,13 @@
"steps": [
{
"name": "Checkout Code",
"uses": "actions/checkout@v1"
"uses": "actions/checkout@v3"
},
{
"name": "Setup Common Lisp Environment",
"uses": "40ants/setup-lisp@v1",
"uses": "40ants/setup-lisp@v2",
"with": {
"asdf-system": "40ants-doc/full",
"asdf-version": "3.3.5.1"
"asdf-system": "40ants-doc/full"
}
},
{
Expand All @@ -36,7 +35,7 @@
},
{
"name": "Update Qlot",
"run": "qlot update || qlot update",
"run": "qlot update --no-deps",
"shell": "bash"
},
{
Expand All @@ -46,7 +45,7 @@
},
{
"name": "Run Linter",
"run": "qlot exec 40ants-linter --system \"40ants-doc/full\"",
"run": "qlot exec 40ants-linter --system \"40ants-doc/full, 40ants-doc-test\" --imports",
"shell": "bash"
}
]
Expand Down
3 changes: 2 additions & 1 deletion 40ants-doc.asd
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
"40ants-doc/core"
"40ants-doc/restart"
"40ants-doc/glossary"
"40ants-doc/changelog")
"40ants-doc/changelog"
"40ants-doc/ignored-words")
:in-order-to ((asdf:test-op (asdf:test-op "40ants-doc-test"))))


Expand Down
4 changes: 2 additions & 2 deletions qlfile.lock
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
("quicklisp" .
(:class qlot/source/dist:source-dist
:initargs (:distribution "http://beta.quicklisp.org/dist/quicklisp.txt" :%version :latest)
:version "2022-07-08"))
:version "2022-11-07"))
("ultralisp" .
(:class qlot/source/dist:source-dist
:initargs (:distribution "http://dist.ultralisp.org" :%version :latest)
:version "20221026145500"))
:version "20221113193500"))
14 changes: 4 additions & 10 deletions src/ci.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,13 @@
(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-version *asdf-version*)))
:asdf-systems ("40ants-doc/full"
"40ants-doc-test")
:check-imports t)))


(defworkflow ci
Expand All @@ -27,13 +23,11 @@
:on-pull-request t
:jobs ((40ants-ci/jobs/run-tests:run-tests
:asdf-system "40ants-doc-full"
:asdf-version *asdf-version*
:coverage t)))


(defworkflow docs
:on-push-to "master"
:on-pull-request t
:jobs ((40ants-ci/jobs/docs:build-docs
:asdf-system "40ants-doc/doc"
:asdf-version *asdf-version*)))
:asdf-system "40ants-doc/doc")))
1 change: 0 additions & 1 deletion src/core.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
(:import-from #:40ants-doc/reference)
(:import-from #:40ants-doc/locatives/base)
(:import-from #:40ants-doc/object-package)
(:import-from #:40ants-doc/ignored-words)
(:import-from #:40ants-doc/docstring
#:strip-docstring-indentation)
(:export #:defsection
Expand Down
2 changes: 2 additions & 0 deletions test/locatives.lisp
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
(defpackage #:40ants-doc-test/locatives
(:use #:cl)
(:import-from #:40ants-doc)
(:import-from #:40ants-doc/swank)
(:import-from #:rove
#:ok
#:testing
Expand Down
3 changes: 3 additions & 0 deletions test/markdown.lisp
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
(defpackage #:40ants-doc-test/markdown
(:use #:cl)
(:import-from #:40ants-doc)
(:import-from #:common-doc)
(:import-from #:40ants-doc/commondoc/markdown)
(:import-from #:rove
#:ok
#:deftest))
Expand Down
2 changes: 2 additions & 0 deletions test/test-transcribe.lisp
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
(uiop:define-package #:40ants-doc-test/test-transcribe
(:use #:cl)
(:import-from #:alexandria)
(:import-from #:40ants-doc)
(:import-from #:40ants-doc/utils)
(:import-from #:40ants-doc/transcribe)
(:import-from #:rove
Expand Down
8 changes: 8 additions & 0 deletions test/test.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@
(:import-from #:40ants-doc
#:defsection)
(:import-from #:40ants-doc/doc)
(:import-from #:40ants-doc/args)
(:import-from #:40ants-doc/builder)
(:import-from #:40ants-doc/locatives/base)
(:import-from #:40ants-doc/source-api)
(:import-from #:40ants-doc/page)
(:import-from #:common-html)
(:import-from #:commondoc-markdown)
(:import-from #:alexandria)
(:import-from #:rove
#:ok
#:deftest
Expand Down
2 changes: 2 additions & 0 deletions test/utils-test.lisp
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
(defpackage #:40ants-doc-test/utils-test
(:use #:cl)
(:import-from #:40ants-doc)
(:import-from #:40ants-doc/utils)
(:import-from #:rove
#:ok
#:deftest))
Expand Down
4 changes: 4 additions & 0 deletions test/xref.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@
#:ok
#:testing
#:deftest)
(:import-from #:40ants-doc)
(:import-from #:40ants-doc/commondoc/builder)
(:import-from #:40ants-doc/commondoc/reference)
(:import-from #:40ants-doc/locatives)
(:import-from #:40ants-doc/reference)
(:import-from #:common-doc
#:make-text
#:make-content)
Expand Down

0 comments on commit 0495f8a

Please sign in to comment.