Skip to content

Commit

Permalink
Merge pull request #34 from ak-coram/macos-14-cache-fixes
Browse files Browse the repository at this point in the history
macos-14 caching fixes
  • Loading branch information
svetlyak40wt authored Apr 26, 2024
2 parents cf2feb4 + abd311b commit 1a45dea
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 8 deletions.
33 changes: 26 additions & 7 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,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."
Expand Down Expand Up @@ -348,7 +350,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
Expand Down
9 changes: 9 additions & 0 deletions changelog.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,15 @@
"PATH"
"CL"
"HOME"))

(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
Expand Down

0 comments on commit 1a45dea

Please sign in to comment.