Fixed loading of quicklisp-osx-fix

Previously the script made unnecessary output and when you had a `qlfile` template in your workflow this output leaked into `qlfile` broking following `qlot install`.
This commit is contained in:
Alexander Artemenko 2024-02-25 13:47:08 +00:00
parent f1fddbf686
commit a7e183c1bc
2 changed files with 16 additions and 11 deletions

View file

@ -272,20 +272,19 @@ runs:
mkdir -p ~/.roswell mkdir -p ~/.roswell
cat >> ~/.roswell/init.lisp <<EOF cat >> ~/.roswell/init.lisp <<EOF
(handler-bind ((error #'(lambda (c) (let ((fix-filename (make-pathname :directory '(:absolute :home ".quicklisp-client-fix")
(uiop:print-condition-backtrace c) :name "quicklisp-fix"
(uiop:quit 1)))) :type "lisp")))
(let ((fix-filename (merge-pathnames (let ((quicklisp-found #+quicklisp t
(make-pathname :directory '(:relative ".quicklisp-client-fix") #-quicklisp nil))
:name "quicklisp-fix"
:type "lisp")
(user-homedir-pathname))))
(cond (cond
((not quicklisp-found)
(warn "Quicklisp is not available, skipping fix loading.~%"))
((probe-file fix-filename) ((probe-file fix-filename)
(format t "Loading quicklisp fix.~%") (handler-bind ((warning #'muffle-warning))
(load fix-filename)) (load fix-filename)))
(t (t
(format t "Quicklisp fix was not found at ~S.~%" fix-filename))))) (warn "Quicklisp fix was not found at ~S.~%" fix-filename)))))
EOF EOF
- if: inputs.cache == 'false' || steps.roswell-cache-restore.outputs.cache-hit != 'true' - if: inputs.cache == 'false' || steps.roswell-cache-restore.outputs.cache-hit != 'true'

View file

@ -8,6 +8,12 @@
(defchangelog (:ignore-words ("ASDF" (defchangelog (:ignore-words ("ASDF"
"PATH" "PATH"
"HOME")) "HOME"))
(4.0.1 2024-02-25
"
# Fixed
* Fixed loading of quicklisp-osx-fix. Previously the script made unnecessary output and when you had a `qlfile` template in your workflow this output leaked into `qlfile` broking following `qlot install`.
")
(4.0.0 2024-02-24 (4.0.0 2024-02-24
" "
# Changed # Changed