diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6e9301e..fdd03d1 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -52,24 +52,43 @@ jobs: lisp: sbcl-bin # OSX - - os: macos-latest + - os: macos-13 lisp: abcl-bin - - os: macos-latest + - os: macos-13 lisp: ccl-bin # https://github.com/40ants/setup-lisp/issues/29 - # - os: macos-latest + # - os: macos-13 # lisp: clasp-bin # https://github.com/40ants/setup-lisp/issues/28 - # - os: macos-latest + # - os: macos-13 # lisp: clisp-head # https://github.com/40ants/setup-lisp/issues/30 - # - os: macos-latest + # - os: macos-13 # lisp: cmu-bin - - os: macos-latest + - os: macos-13 lisp: ecl - - os: macos-latest + - os: macos-13 lisp: sbcl-bin + - os: macos-14 + lisp: abcl-bin + # - os: macos-14 + # lisp: ccl-bin + # https://github.com/40ants/setup-lisp/issues/29 + # - os: macos-14 + # lisp: clasp-bin + # https://github.com/40ants/setup-lisp/issues/28 + # - os: macos-14 + # lisp: clisp-head + # https://github.com/40ants/setup-lisp/issues/30 + # - os: macos-14 + # lisp: cmu-bin + - os: macos-14 + lisp: ecl + - os: macos-14 + lisp: sbcl-bin + + # Windows # https://github.com/40ants/setup-lisp/issues/27 diff --git a/.gitignore b/.gitignore index 2720985..f514c9e 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /env/ /.qlot /README +*.fasl diff --git a/ChangeLog.md b/ChangeLog.md index 0e6a75a..a82b2a3 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -2,6 +2,44 @@ # ChangeLog +<a id="x-28PROJECT-DOCS-2FCHANGELOG-3A-3A-7C4-2E2-2E1-7C-2040ANTS-DOC-2FLOCATIVES-3ASECTION-29"></a> + +## 4.2.1 (2024-12-15) + +Fixed the way how we set dynamic-space-size. + +<a id="x-28PROJECT-DOCS-2FCHANGELOG-3A-3A-7C4-2E2-2E0-7C-2040ANTS-DOC-2FLOCATIVES-3ASECTION-29"></a> + +## 4.2.0 (2024-12-14) + +Input variable `dynamic-space-size` was added. It can be used to default set memory size for `SBCL`. + +<a id="x-28PROJECT-DOCS-2FCHANGELOG-3A-3A-7C4-2E1-2E0-7C-2040ANTS-DOC-2FLOCATIVES-3ASECTION-29"></a> + +## 4.1.0 (2024-05-17) + +<a id="added"></a> + +### Added + +* Input argument qlot-no-deps was added. + +Make Qlot ignore asd files and their dependencies. + +This this might be useful in rare cases when your project contains a non-readable asd files such as templates. + +<a id="x-28PROJECT-DOCS-2FCHANGELOG-3A-3A-7C4-2E0-2E5-7C-2040ANTS-DOC-2FLOCATIVES-3ASECTION-29"></a> + +## 4.0.5 (2024-04-19) + +<a id="fixed"></a> + +### Fixed + +* Extended test matrix with macos-14 runner. +* Fixed Roswell cache paths for macos-14 runner. +* Extended qlot cache key with runner architecture. + <a id="x-28PROJECT-DOCS-2FCHANGELOG-3A-3A-7C4-2E0-2E4-7C-2040ANTS-DOC-2FLOCATIVES-3ASECTION-29"></a> ## 4.0.4 (2024-04-18) diff --git a/action.yml b/action.yml index 1939ebd..e3d1213 100644 --- a/action.yml +++ b/action.yml @@ -8,6 +8,10 @@ inputs: required: false default: v23.10.14.114 + dynamic-space-size: + description: 'If given, then will be used to change dynamic space size for SBCL. This value will be written to ~/.roswell/config' + required: false + asdf-system: description: 'ASDF system to install' required: false @@ -22,6 +26,11 @@ inputs: required: false default: 0.11.5 + qlot-no-deps: + description: 'Make Qlot ignore asd files and their dependencies. This this might be useful in rare cases when your project contains a non-readable asd files such as templates.' + required: false + default: false + qlfile-template: description: "Djula template for qlfile. All environment variables are available in it's context" required: false @@ -46,6 +55,8 @@ inputs: /usr/local/etc/roswell /usr/local/bin/ros /usr/local/Cellar/roswell + /opt/homebrew/bin/ros + /opt/homebrew/Cellar/roswell qlot-cache-paths: description: "Internal var. Don't use it." @@ -252,6 +263,11 @@ runs: curl -L https://raw.githubusercontent.com/roswell/roswell/master/scripts/install-for-ci.sh | bash -xeo pipefail fi + if [[ "${{ inputs.dynamic-space-size }}" != "" ]]; then + echo ::group::Changing Dynamic Space Size in Roswell Config + ros config set dynamic-space-size ${{ inputs.dynamic-space-size }} + fi + echo ::endgroup:: - if: inputs.cache == 'false' || steps.roswell-cache-restore.outputs.cache-hit != 'true' @@ -348,7 +364,7 @@ runs: uses: actions/cache/restore@v4 with: path: ${{ inputs.qlot-cache-paths }} - key: qlot-${{ steps.locals.outputs.current-month }}-${{ env.cache-name }}-${{ runner.os }}-${{ env.QUICKLISP_DIST }}-${{ env.LISP }}-${{ hashFiles('qlfile', 'qlfile.lock', '*.asd') }}-${{ inputs.cache-suffix }} + key: qlot-${{ steps.locals.outputs.current-month }}-${{ env.cache-name }}-${{ runner.os }}-${{ runner.arch }}-${{ env.QUICKLISP_DIST }}-${{ env.LISP }}-${{ hashFiles('qlfile', 'qlfile.lock', '*.asd') }}-${{ inputs.cache-suffix }} - if: inputs.cache == 'true' && steps.qlot-cache-restore.outputs.cache-hit == 'true' name: Restore Path To .qlot/bin @@ -361,7 +377,13 @@ runs: shell: lispsh -eo pipefail {0} run: | echo ::group::Create Qlot Environment - qlot install + if [[ "${{ inputs.qlot-no-deps }}" != 'false' ]]; then + echo 'Running Qlot with --no-deps argument' + qlot install --no-deps + else + echo 'Running Qlot as usual' + qlot install + fi echo ::endgroup:: env: QLFILE_TEMPLATE: ${{ inputs.qlfile-template }} diff --git a/changelog.lisp b/changelog.lisp index 9d9cab5..89be45f 100644 --- a/changelog.lisp +++ b/changelog.lisp @@ -8,7 +8,30 @@ (defchangelog (:ignore-words ("ASDF" "PATH" "CL" + "SBCL" "HOME")) + + (4.2.1 2024-12-15 + "Fixed the way how we set dynamic-space-size.") + (4.2.0 2024-12-14 + "Input variable `dynamic-space-size` was added. It can be used to default set memory size for SBCL.") + (4.1.0 2024-05-17 + " +# Added + +* Input argument qlot-no-deps was added. + + Make Qlot ignore asd files and their dependencies. + + This this might be useful in rare cases when your project contains a non-readable asd files such as templates.") + (4.0.5 2024-04-19 + " +# Fixed + +* Extended test matrix with macos-14 runner. +* Fixed Roswell cache paths for macos-14 runner. +* Extended qlot cache key with runner architecture. +") (4.0.4 2024-04-18 " # Fixed diff --git a/qlfile.lock b/qlfile.lock index 5b007a6..81abab8 100644 --- 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-10-21")) + :initargs (:distribution "https://beta.quicklisp.org/dist/quicklisp.txt" :%version :latest) + :version "2024-10-12")) ("ultralisp" . (:class qlot/source/dist:source-dist - :initargs (:distribution "http://dist.ultralisp.org" :%version :latest) - :version "20240304201501")) + :initargs (:distribution "https://dist.ultralisp.org" :%version :latest) + :version "20241214090000")) ("sly" . (:class qlot/source/github:source-github :initargs (:repos "svetlyak40wt/sly" :ref nil :branch "patches" :tag nil)