diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c3a7b58..1edac2f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,41 +24,15 @@ "steps": [ { "name": "Checkout Code", - "uses": "actions/checkout@v3" - }, - { - "name": "Grant All Perms to Make Cache Restoring Possible", - "run": "sudo mkdir -p /usr/local/etc/roswell\n sudo chown \"${USER}\" /usr/local/etc/roswell\n # Here the ros binary will be restored:\n sudo chown \"${USER}\" /usr/local/bin", - "shell": "bash" - }, - { - "name": "Get Current Month", - "id": "current-month", - "run": "echo \"value=$(date -u \"+%Y-%m\")\" >> $GITHUB_OUTPUT", - "shell": "bash" - }, - { - "name": "Cache Roswell Setup", - "id": "cache", - "uses": "actions/cache@v3", - "with": { - "path": "qlfile\nqlfile.lock\n~/.cache/common-lisp/\n~/.roswell\n/usr/local/etc/roswell\n/usr/local/bin/ros\n/usr/local/Cellar/roswell\n.qlot", - "key": "a-${{ steps.current-month.outputs.value }}-${{ env.cache-name }}-ubuntu-latest-quicklisp-sbcl-bin-${{ hashFiles('qlfile.lock', '*.asd') }}" - } - }, - { - "name": "Restore Path To Cached Files", - "run": "echo $HOME/.roswell/bin >> $GITHUB_PATH\n echo .qlot/bin >> $GITHUB_PATH", - "shell": "bash", - "if": "steps.cache.outputs.cache-hit == 'true'" + "uses": "actions/checkout@v4" }, { "name": "Setup Common Lisp Environment", - "uses": "40ants/setup-lisp@v2", + "uses": "40ants/setup-lisp@v4", "with": { - "asdf-system": "log4cl-extras" - }, - "if": "steps.cache.outputs.cache-hit != 'true'" + "asdf-system": "log4cl-extras", + "cache": "true" + } }, { "name": "Change dist to Ultralisp if qlfile does not exist", @@ -90,13 +64,19 @@ "ubuntu-latest", "macos-latest" ], + "exclude": [ + { + "os": "macos-latest", + "lisp": "ccl-bin" + } + ], "quicklisp": [ "ultralisp", "quicklisp" ], "lisp": [ "sbcl-bin", - "ccl-bin/1.12.0", + "ccl-bin", "ecl" ] } @@ -110,41 +90,15 @@ "steps": [ { "name": "Checkout Code", - "uses": "actions/checkout@v3" - }, - { - "name": "Grant All Perms to Make Cache Restoring Possible", - "run": "sudo mkdir -p /usr/local/etc/roswell\n sudo chown \"${USER}\" /usr/local/etc/roswell\n # Here the ros binary will be restored:\n sudo chown \"${USER}\" /usr/local/bin", - "shell": "bash" - }, - { - "name": "Get Current Month", - "id": "current-month", - "run": "echo \"value=$(date -u \"+%Y-%m\")\" >> $GITHUB_OUTPUT", - "shell": "bash" - }, - { - "name": "Cache Roswell Setup", - "id": "cache", - "uses": "actions/cache@v3", - "with": { - "path": "qlfile\nqlfile.lock\n~/.cache/common-lisp/\n~/.roswell\n/usr/local/etc/roswell\n/usr/local/bin/ros\n/usr/local/Cellar/roswell\n.qlot", - "key": "a-${{ steps.current-month.outputs.value }}-${{ env.cache-name }}-${{ matrix.os }}-${{ matrix.quicklisp }}-${{ matrix.lisp }}-${{ hashFiles('qlfile.lock', '*.asd') }}" - } - }, - { - "name": "Restore Path To Cached Files", - "run": "echo $HOME/.roswell/bin >> $GITHUB_PATH\n echo .qlot/bin >> $GITHUB_PATH", - "shell": "bash", - "if": "steps.cache.outputs.cache-hit == 'true'" + "uses": "actions/checkout@v4" }, { "name": "Setup Common Lisp Environment", - "uses": "40ants/setup-lisp@v2", + "uses": "40ants/setup-lisp@v4", "with": { - "asdf-system": "log4cl-extras" - }, - "if": "steps.cache.outputs.cache-hit != 'true'" + "asdf-system": "log4cl-extras", + "cache": "true" + } }, { "name": "Run Tests", diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 261c3c8..f3acda7 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -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": "log4cl-extras/doc" + "asdf-system": "log4cl-extras/doc", + "cache": "false" } }, { diff --git a/qlfile.lock b/qlfile.lock index f4b903f..698ab3f 100644 --- a/qlfile.lock +++ b/qlfile.lock @@ -5,4 +5,4 @@ ("ultralisp" . (:class qlot/source/dist:source-dist :initargs (:distribution "http://dist.ultralisp.org/" :%version :latest) - :version "20240303155001")) + :version "20240709152001")) diff --git a/src/ci.lisp b/src/ci.lisp index ee0a1d5..f652e12 100644 --- a/src/ci.lisp +++ b/src/ci.lisp @@ -23,8 +23,11 @@ :quicklisp ("ultralisp" "quicklisp") :lisp ("sbcl-bin" - "ccl-bin/1.12.0" + "ccl-bin" "ecl") + :exclude '((:os "macos-latest" + ;; Not supported platform arm64. + :lisp "ccl-bin")) :coverage t)))