Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

All jobs now use setup-lisp@v4 where internal caching was implemented. #21

Merged
merged 3 commits into from
Feb 27, 2024
Merged

All jobs now use setup-lisp@v4 where internal caching was implemented. #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
56f59c1
All jobs now use setup-lisp@v4 where internal caching was implemented.
svetlyak40wt Feb 27, 2024
3d7d2cb
Removed unused import.
svetlyak40wt Feb 27, 2024
78ed4aa
Updated 40ants-ci workflows.
svetlyak40wt Feb 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,14 @@
"steps": [
{
"name": "Checkout Code",
"uses": "actions/checkout@v3"
"uses": "actions/checkout@v4"
},
{
"name": "Setup Common Lisp Environment",
"uses": "40ants/setup-lisp@v2",
"uses": "40ants/setup-lisp@v4",
"with": {
"asdf-system": "40ants-ci"
"asdf-system": "40ants-ci",
"cache": "true"
}
},
{
Expand Down Expand Up @@ -65,13 +66,14 @@
"steps": [
{
"name": "Checkout Code",
"uses": "actions/checkout@v3"
"uses": "actions/checkout@v4"
},
{
"name": "Setup Common Lisp Environment",
"uses": "40ants/setup-lisp@v2",
"uses": "40ants/setup-lisp@v4",
"with": {
"asdf-system": "40ants-ci"
"asdf-system": "40ants-ci",
"cache": "true"
}
},
{
Expand Down Expand Up @@ -110,7 +112,7 @@
],
"lisp": [
"sbcl-bin",
"ccl-bin/1.12.1"
"ccl-bin"
]
}
},
Expand All @@ -123,14 +125,15 @@
"steps": [
{
"name": "Checkout Code",
"uses": "actions/checkout@v3"
"uses": "actions/checkout@v4"
},
{
"name": "Setup Common Lisp Environment",
"uses": "40ants/setup-lisp@v2",
"uses": "40ants/setup-lisp@v4",
"with": {
"asdf-system": "40ants-ci",
"qlfile-template": "{% ifequal quicklisp_dist \"ultralisp\" %}\ndist ultralisp http://dist.ultralisp.org\n{% endifequal %}"
"qlfile-template": "{% ifequal quicklisp_dist \"ultralisp\" %}\ndist ultralisp http://dist.ultralisp.org\n{% endifequal %}",
"cache": "true"
}
},
{
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/docs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,14 @@
"steps": [
{
"name": "Checkout Code",
"uses": "actions/checkout@v3"
"uses": "actions/checkout@v4"
},
{
"name": "Setup Common Lisp Environment",
"uses": "40ants/setup-lisp@v2",
"uses": "40ants/setup-lisp@v4",
"with": {
"asdf-system": "40ants-ci"
"asdf-system": "40ants-ci",
"cache": "true"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"steps": [
{
"name": "Checkout Code",
"uses": "actions/checkout@v3"
"uses": "actions/checkout@v4"
},
{
"name": "Create release tag",
Expand Down
9 changes: 9 additions & 0 deletions src/changelog.lisp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,15 @@
"GITHUB_TOKEN"
"OSX")
:external-docs ("https://40ants.com/40ants-asdf-system/"))
(0.14.0 2024-02-25
"
Changed
=======

All jobs now use setup-lisp@v4 where internal caching was implemented.

Also all jobs were switched to from `actions/checkout@v3` to `actions/checkout@v4` action.
")
(0.13.0 2023-12-14
"
Changed
Expand Down
8 changes: 3 additions & 5 deletions src/ci.lisp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@
:on-push-to "master"
:on-pull-request t
:by-cron "0 10 * * 1"
;; :cache t
:cache t
:jobs ((40ants-ci/jobs/docs:build-docs)))


(defworkflow ci
:on-push-to "master"
:by-cron "0 10 * * 1"
:on-pull-request t
;; :cache t
:cache t
:jobs ((40ants-ci/jobs/linter:linter
:asdf-systems ("40ants-ci"
"40ants-ci-tests")
Expand All @@ -43,9 +43,7 @@
:quicklisp ("quicklisp"
"ultralisp")
:lisp ("sbcl-bin"
;; Version was fixed because of this bug:
;; https://github.com/roswell/roswell/issues/534
"ccl-bin/1.12.1")
"ccl-bin")
:coverage t
:qlfile "{% ifequal quicklisp_dist \"ultralisp\" %}
dist ultralisp http://dist.ultralisp.org
Expand Down
16 changes: 8 additions & 8 deletions src/core.lisp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,11 +139,11 @@ it will generate `.github/workflows/linter.yml` with following content:
\"steps\": [
{
\"name\": \"Checkout Code\",
\"uses\": \"actions/checkout@v3\"
\"uses\": \"actions/checkout@v4\"
},
{
\"name\": \"Setup Common Lisp Environment\",
\"uses\": \"40ants/setup-lisp@v3\",
\"uses\": \"40ants/setup-lisp@v4\",
\"with\": {
\"asdf-system\": \"example\"
}
Expand Down Expand Up @@ -285,11 +285,11 @@ It will generate `.github/workflows/ci.yml` with following content:
\"steps\": [
{
\"name\": \"Checkout Code\",
\"uses\": \"actions/checkout@v3\"
\"uses\": \"actions/checkout@v4\"
},
{
\"name\": \"Setup Common Lisp Environment\",
\"uses\": \"40ants/setup-lisp@v3\",
\"uses\": \"40ants/setup-lisp@v4\",
\"with\": {
\"asdf-system\": \"example\"
}
Expand Down Expand Up @@ -435,11 +435,11 @@ It will generate `.github/workflows/docs.yml` with following content:
\"steps\": [
{
\"name\": \"Checkout Code\",
\"uses\": \"actions/checkout@v3\"
\"uses\": \"actions/checkout@v4\"
},
{
\"name\": \"Setup Common Lisp Environment\",
\"uses\": \"40ants/setup-lisp@v3\",
\"uses\": \"40ants/setup-lisp@v4\",
\"with\": {
\"asdf-system\": \"example\",
\"qlfile-template\": \"\"
Expand Down Expand Up @@ -484,7 +484,7 @@ Here is the diff of the generated workflow file. It shows steps, added automatic
modified .github/workflows/docs.yml
@@ -20,13 +20,40 @@
\"name\": \"Checkout Code\",
\"uses\": \"actions/checkout@v3\"
\"uses\": \"actions/checkout@v4\"
},
+ {
+ \"name\": \"Grant All Perms to Make Cache Restoring Possible\",
Expand Down Expand Up @@ -514,7 +514,7 @@ modified .github/workflows/docs.yml
+ },
{
\"name\": \"Setup Common Lisp Environment\",
\"uses\": \"40ants/setup-lisp@v3\",
\"uses\": \"40ants/setup-lisp@v4\",
\"with\": {
\"asdf-system\": \"40ants-ci\",
\"qlfile-template\": \"\"
Expand Down
2 changes: 1 addition & 1 deletion src/jobs/autotag.lisp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
(defmethod 40ants-ci/jobs/job:steps ((job autotag))
(append (list
(action "Checkout Code"
"actions/checkout@v3"))
"actions/checkout@v4"))
(list
(action "Create release tag"
"butlerlogic/action-autotag@8bc1ad456dcdee34e8c6ffbce991cc31793578c2"
Expand Down
46 changes: 5 additions & 41 deletions src/jobs/lisp-job.lisp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
#:single
#:dedent
#:current-system-name)
(:import-from #:40ants-ci/steps/sh
#:sh)
(:import-from #:40ants-ci/vars
#:*use-cache*)
(:import-from #:serapeum
Expand Down Expand Up @@ -127,54 +125,20 @@
(write-string "${{ hashFiles('qlfile.lock', '*.asd') }}" s))))


(defgeneric make-cache-steps (job)
(:method ((job lisp-job))
(when 40ants-ci/vars:*use-cache*
(let ((paths-to-cache
(list "qlfile"
"qlfile.lock"
"~/.cache/common-lisp/"
"~/.roswell"
"/usr/local/etc/roswell"
"/usr/local/bin/ros"
;; On OSX Roswell is installed
;; using Homebrew and /usr/local/bin/ros
;; is a symlink into a Cellar directory:
"/usr/local/Cellar/roswell"
".qlot")))
(list (sh "Grant All Perms to Make Cache Restoring Possible"
"sudo mkdir -p /usr/local/etc/roswell
sudo chown \"${USER}\" /usr/local/etc/roswell
# Here the ros binary will be restored:
sudo chown \"${USER}\" /usr/local/bin")
(sh "Get Current Month"
"echo \"value=$(date -u \"+%Y-%m\")\" >> $GITHUB_OUTPUT"
:id "current-month")
(action "Cache Roswell Setup"
"actions/cache@v3"
:id "cache"
:path (format nil "~{~A~^~%~}" paths-to-cache)
:key (make-cache-key job))
(sh "Restore Path To Cached Files"
"echo $HOME/.roswell/bin >> $GITHUB_PATH
echo .qlot/bin >> $GITHUB_PATH"
:if "steps.cache.outputs.cache-hit == 'true'"))))))


(defmethod 40ants-ci/jobs/job:steps ((job lisp-job))
(append (list
(action "Checkout Code"
"actions/checkout@v3"))
(make-cache-steps job)
"actions/checkout@v4"))
(list
(action "Setup Common Lisp Environment"
"40ants/setup-lisp@v3"
"40ants/setup-lisp@v4"
:asdf-system (asdf-system job)
:asdf-version (asdf-version job)
:roswell-version (roswell-version job)
:qlot-version (qlot-version job)
:qlfile-template (when (qlfile job)
(dedent (qlfile job)))
:if (when *use-cache*
"steps.cache.outputs.cache-hit != 'true'")))
:cache (if *use-cache*
"true"
"false")))
(call-next-method)))
Loading