Skip to content

Commit

Permalink
Merge pull request #12 from 40ants/use-quicklisp-fix
Browse files Browse the repository at this point in the history
Use quicklisp fix
  • Loading branch information
svetlyak40wt authored Dec 13, 2023
2 parents 13e1c3e + df23291 commit 7d38ee8
Show file tree
Hide file tree
Showing 5 changed files with 76 additions and 5 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,18 +117,18 @@
"if": "steps.cache.outputs.cache-hit != '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"
},
{
Expand Down
39 changes: 39 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"name": "RELEASE",
"on": {
"push": {
"branches": [
"master"
]
}
},
"jobs": {
"autotag": {
"permissions": {
"contents": "write"
},
"runs-on": "ubuntu-latest",
"env": {
"OS": "ubuntu-latest"
},
"steps": [
{
"name": "Checkout Code",
"uses": "actions/checkout@v3"
},
{
"name": "Create release tag",
"uses": "butlerlogic/action-autotag@8bc1ad456dcdee34e8c6ffbce991cc31793578c2",
"with": {
"root": "ChangeLog.md",
"regex_pattern": "^## (?<version>\\d+\\.\\d+\\.\\d+.*?)( |\\n).*$",
"tag_prefix": "v"
},
"env": {
"GITHUB_TOKEN": "${{ secrets.GITHUB_TOKEN }}"
}
}
]
}
}
}
23 changes: 23 additions & 0 deletions action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,29 @@ runs:
# the other Lisp files in general, so it's better to tell Quicklisp
# to update all its dists.
ros -e "(ql:update-all-dists :prompt nil)"
- name: Install Quicklisp patch for package-inferred systems
shell: lispsh {0}
run: |
git clone \
--no-tags \
--single-branch \
--depth=1 \
https://github.com/40ants/quicklisp-client-fix \
~/.quicklisp-client-fix
mkdir -p ~/.roswell
cat >> ~/.roswell/init.lisp <<EOF
(let ((fix-filename (make-pathname :directory '(:absolute :home ".quicklisp-client-fix")
:name "quicklisp-fix"
:type "lisp")))
(cond
((probe-file fix-filename)
(format t "Loading quicklisp fix.~%")
(load fix-filename))
(t
(format t "Quicklisp fix was not found at ~S.~%" fix-filename))))
EOF
- name: Upgrade ASDF to the Latest Version
shell: lispsh {0}
run: |
Expand Down
2 changes: 2 additions & 0 deletions changelog.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@


(defchangelog (:ignore-words ("ASDF"))
(3.0.0 2023-12-14
"Now action uses a fix for Quicklisp client which makes it possible to load package inferred ASDF systems by name of the subsystem.")
(2.1.0 2022-11-10
"Moved to newer action msys2/[email protected] where a warning about stale Node.js version is fixed.")
(2.0.0 2021-10-28
Expand Down
9 changes: 8 additions & 1 deletion ci.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,17 @@
(:use #:cl)
(:import-from #:40ants-ci/workflow
#:defworkflow)
(:import-from #:40ants-ci/jobs/docs))
(:import-from #:40ants-ci/jobs/docs)
(:import-from #:40ants-ci/jobs/autotag)
(:import-from #:40ants-ci/jobs/linter))
(in-package project-docs/ci)


(defworkflow release
:on-push-to "master"
:jobs ((40ants-ci/jobs/autotag:autotag)))


(defworkflow docs
:on-push-to "master"
:on-pull-request t
Expand Down

0 comments on commit 7d38ee8

Please sign in to comment.