Merge pull request #22 from 40ants/fixing-docs-building

Run tests on different lisp implementations.
40ants · Mar 2, 2024 · 633ae5e · 633ae5e
2 parents ed8a4a3 + 5bb2426
commit 633ae5e
Show file tree

Hide file tree

Showing 23 changed files with 967 additions and 671 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -145,6 +145,41 @@
           }
         }
       ]
+    },
+    "custom-steps": {
+      "runs-on": "ubuntu-latest",
+      "env": {
+        "OS": "ubuntu-latest",
+        "QUICKLISP_DIST": "quicklisp",
+        "LISP": "ccl-bin"
+      },
+      "steps": [
+        {
+          "name": "Checkout Code",
+          "uses": "actions/checkout@v4"
+        },
+        {
+          "name": "Setup Common Lisp Environment",
+          "uses": "40ants/setup-lisp@v4",
+          "with": {
+            "asdf-system": "40ants-ci",
+            "cache": "true"
+          }
+        },
+        {
+          "name": "Show Roswell Config",
+          "run": "ros config",
+          "shell": "bash"
+        },
+        {
+          "name": "Custom ENV",
+          "run": "echo $CUSTOM_ENV",
+          "shell": "bash",
+          "env": {
+            "CUSTOM_ENV": "Hello world!"
+          }
+        }
+      ]
     }
   }
 }
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -13,10 +13,14 @@
       }
     ]
   },
+  "env": {
+    "CUSTOM_ENV_HELLO": "Hello"
+  },
   "jobs": {
     "build-docs": {
       "runs-on": "ubuntu-latest",
       "env": {
+        "CUSTOM_ENV_WORLD": "World!",
         "OS": "ubuntu-latest",
         "QUICKLISP_DIST": "quicklisp",
         "LISP": "sbcl-bin"
@@ -30,15 +34,15 @@
           "name": "Setup Common Lisp Environment",
           "uses": "40ants/setup-lisp@v4",
           "with": {
-            "asdf-system": "40ants-ci",
+            "asdf-system": "40ants-ci-docs",
             "cache": "true"
           }
         },
         {
           "name": "Build Docs",
           "uses": "40ants/build-docs@v1",
           "with": {
-            "asdf-system": "40ants-ci",
+            "asdf-system": "40ants-ci-docs",
             "error-on-warnings": true
           }
         }

diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
-/docs/
+/docs/build/
 /env/
 /.qlot
-/.DS_Store
 *.fasl
+.DS_Store
diff --git a/40ants-ci-docs.asd b/40ants-ci-docs.asd
@@ -0,0 +1,11 @@
+(defsystem "40ants-ci-docs"
+  :author "Alexander Artemenko <[email protected]>"
+  :license "Unlicense"
+  :class :package-inferred-system
+  :description "Provides documentation for 40ants-ci."
+  :source-control (:git "https://github.com/40ants/ci")
+  :bug-tracker "https://github.com/40ants/ci/issues"
+  :homepage "https://40ants.com/ci/"
+  :pathname "docs"
+  :depends-on ("40ants-ci"
+               "40ants-ci-docs/index"))
diff --git a/40ants-ci.asd b/40ants-ci.asd
@@ -6,8 +6,12 @@
   :defsystem-depends-on ("40ants-asdf-system")
   :pathname "src"
   :depends-on ("40ants-ci/core"
-               "40ants-ci/ci"
-               "40ants-ci/changelog")
+               "40ants-ci/jobs/job"
+               "40ants-ci/jobs/docs"
+               "40ants-ci/jobs/linter"
+               "40ants-ci/jobs/critic"
+               "40ants-ci/jobs/run-tests"
+               "40ants-ci/jobs/autotag")
   :description "A tool simplify continuous deployment for Common Lisp projects."
   :homepage "https://40ants.com/ci/"
   :source-control (:git "https://github.com/40ants/ci")

diff --git a/src/changelog.lisp → docs/changelog.lisp b/src/changelog.lisp → docs/changelog.lisp
@@ -1,8 +1,8 @@
-(uiop:define-package #:40ants-ci/changelog
+(uiop:define-package #:40ants-ci-docs/changelog
   (:use #:cl)
   (:import-from #:40ants-doc/changelog
                 #:defchangelog))
-(in-package #:40ants-ci/changelog)
+(in-package #:40ants-ci-docs/changelog)
 
 
 (defchangelog (:ignore-words ("40ANTS-DOC"
@@ -11,6 +11,21 @@
 			      "GITHUB_TOKEN"
                               "OSX")
                :external-docs ("https://40ants.com/40ants-asdf-system/"))
+  (0.15.0 2024-03-02
+          "
+New
+===
+
+* Now you can specify ENV argument to 40ANTS-CI:DEFWORKFLOW and any job. This should be an alist where keys are strings and values are evaluated during GitHub workflow generation phase. Read more in 40ANTS-CI-DOCS/INDEX::@ENV section.
+* 40ANTS-CI/JOBS/AUTOTAG:AUTOTAG function now ignores TOKEN-PATTERN argument if ENV argument was given and has GITHUB_TOKEN value for whole job.
+
+Backward incompatible changes
+=============================
+
+* When additional keyword arguments to 40ANTS-CI/STEPS/SH:SH function are given, they are transformed into env variables. Previously, their names were taken as is. Now they are uppercased and dash symbols are replaced with underscores.
+
+
+")
   (0.14.0 2024-02-25
           "
 Changed