Merge pull request #8 from 40ants/update-deps

Update deps and CI workflow.
40ants · Mar 11, 2024 · dffb6b9 · dffb6b9
2 parents d1e1dab + 1be2df3
commit dffb6b9
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 12 deletions.
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -19,14 +19,15 @@
       "steps": [
         {
           "name": "Checkout Code",
-          "uses": "actions/checkout@v1"
+          "uses": "actions/checkout@v4"
         },
         {
           "name": "Setup Common Lisp Environment",
-          "uses": "40ants/setup-lisp@v1",
+          "uses": "40ants/setup-lisp@v4",
           "with": {
             "asdf-system": "docs-builder",
-            "asdf-version": "3.3.5.1"
+            "asdf-version": "3.3.5.1",
+            "cache": "true"
           }
         },
         {

diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
@@ -19,29 +19,30 @@
       "steps": [
         {
           "name": "Checkout Code",
-          "uses": "actions/checkout@v1"
+          "uses": "actions/checkout@v4"
         },
         {
           "name": "Setup Common Lisp Environment",
-          "uses": "40ants/setup-lisp@v1",
+          "uses": "40ants/setup-lisp@v4",
           "with": {
             "asdf-system": "docs-builder",
-            "asdf-version": "3.3.5.1"
+            "asdf-version": "3.3.5.1",
+            "cache": "true"
           }
         },
         {
-          "name": "Change dist to Ultralisp",
-          "run": "echo 'dist ultralisp http://dist.ultralisp.org' > qlfile",
+          "name": "Change dist to Ultralisp if qlfile does not exist",
+          "run": "if [[ ! -e qlfile ]]; then echo 'dist ultralisp http://dist.ultralisp.org' > qlfile; fi",
           "shell": "bash"
         },
         {
           "name": "Update Qlot",
-          "run": "qlot update || qlot update",
+          "run": "qlot update --no-deps",
           "shell": "bash"
         },
         {
           "name": "Install SBLint wrapper",
-          "run": "qlot exec ros install 40ants-linter",
+          "run": "qlot exec ros install 40ants-asdf-system 40ants-linter",
           "shell": "bash"
         },
         {

diff --git a/qlfile.lock b/qlfile.lock
@@ -1,11 +1,11 @@
 ("quicklisp" .
  (:class qlot/source/dist:source-dist
   :initargs (:distribution "http://beta.quicklisp.org/dist/quicklisp.txt" :%version :latest)
-  :version "2023-02-15"))
+  :version "2023-10-21"))
 ("ultralisp" .
  (:class qlot/source/dist:source-dist
   :initargs (:distribution "http://dist.ultralisp.org" :%version :latest)
-  :version "20230605020501"))
+  :version "20240311030500"))
 ("sly" .
  (:class qlot/source/github:source-github
   :initargs (:repos "svetlyak40wt/sly" :ref nil :branch "patches" :tag nil)

diff --git a/src/ci.lisp b/src/ci.lisp
@@ -16,13 +16,15 @@
 (defworkflow linter
   :on-push-to "master"
   :on-pull-request t
+  :cache t
   :jobs ((40ants-ci/jobs/linter:linter
           :asdf-version *asdf-version*)))
 
 
 (defworkflow docs
   :on-push-to "master"
   :on-pull-request t
+  :cache t
   :jobs ((40ants-ci/jobs/docs:build-docs
           ;; There are still a few warnings which should be shown.
           ;; And I have no time to fix this.