From eafa22e5ca41aede68f03bf48c7a0233da4c2af1 Mon Sep 17 00:00:00 2001 From: Alexander Artemenko Date: Wed, 13 Dec 2023 21:40:35 +0000 Subject: [PATCH 1/4] Use quicklisp client fix to load package-inferred systems without problems. --- action.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/action.yml b/action.yml index b5065da..b314787 100644 --- a/action.yml +++ b/action.yml @@ -188,6 +188,27 @@ 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 + + cat >> ~/.roswell/init.lisp < Date: Wed, 13 Dec 2023 22:11:48 +0000 Subject: [PATCH 2/4] Updated changelog. --- .github/workflows/docs.yml | 8 +++---- .github/workflows/release.yml | 39 +++++++++++++++++++++++++++++++++++ changelog.lisp | 2 ++ ci.lisp | 9 +++++++- 4 files changed, 53 insertions(+), 5 deletions(-) create mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 0164985..7873bc5 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -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" }, { diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..954a253 --- /dev/null +++ b/.github/workflows/release.yml @@ -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": "^## (?\\d+\\.\\d+\\.\\d+.*?)( |\\n).*$", + "tag_prefix": "v" + }, + "env": { + "GITHUB_TOKEN": "${{ secrets.GITHUB_TOKEN }}" + } + } + ] + } + } +} \ No newline at end of file diff --git a/changelog.lisp b/changelog.lisp index c2206b6..0be37ca 100644 --- a/changelog.lisp +++ b/changelog.lisp @@ -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/setup-msys2@2.14.2 where a warning about stale Node.js version is fixed.") (2.0.0 2021-10-28 diff --git a/ci.lisp b/ci.lisp index 4e12ea7..bc21575 100644 --- a/ci.lisp +++ b/ci.lisp @@ -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 From b07ebec1b457a523ed769c033d9b8624e42ceb32 Mon Sep 17 00:00:00 2001 From: Alexander Artemenko Date: Wed, 13 Dec 2023 22:17:00 +0000 Subject: [PATCH 3/4] Replace tab. --- action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/action.yml b/action.yml index b314787..22747fa 100644 --- a/action.yml +++ b/action.yml @@ -201,7 +201,7 @@ runs: cat >> ~/.roswell/init.lisp < Date: Wed, 13 Dec 2023 22:29:30 +0000 Subject: [PATCH 4/4] Create .roswell folder. --- action.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/action.yml b/action.yml index 22747fa..6ce3e06 100644 --- a/action.yml +++ b/action.yml @@ -197,7 +197,9 @@ runs: --depth=1 \ https://github.com/40ants/quicklisp-client-fix \ ~/.quicklisp-client-fix - + + mkdir -p ~/.roswell + cat >> ~/.roswell/init.lisp <