Bump 40ants/setup-lisp to v4 in workflows

ak-coram · May 2, 2024 · de8e19d · de8e19d
1 parent 2f52699
commit de8e19d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/.github/workflows/Benchmark.yml b/.github/workflows/Benchmark.yml
@@ -23,15 +23,16 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Setup Lisp
-        continue-on-error: true
-        uses: 40ants/setup-lisp@v2
+        uses: 40ants/setup-lisp@v4
         with:
           qlfile-template: |
             dist ultralisp http://dist.ultralisp.org
 
       - name: Run benchmarks
         shell: bash
         run: |
+          ros install neil-lindquist/ci-utils
+          asdf-register-project
           echo "Base benchmark"
           ros run --eval '(ql:quickload :frugal-uuid/benchmark)' --eval '(progn (asdf:test-system :frugal-uuid/benchmark) (quit))'
           echo "Non-frugal benchmark"

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -13,37 +13,36 @@ on:
 
 jobs:
   test:
-    name: ${{ matrix.lisp }} / ${{ matrix.quicklisp-dist }} on ${{ matrix.os }}
+    name: ${{ matrix.lisp }} on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         lisp: [sbcl-bin, ccl-bin/1.12.2, ecl/23.9.9]
         os: [ubuntu-latest, windows-latest, macos-latest]
-        quicklisp-dist:
-          - ultralisp
         exclude:
           - os: windows-latest
             lisp: ecl/23.9.9
+          - os: windows-latest
+            lisp: ccl-bin/1.12.2
+          - os: macos-latest
+            lisp: ccl-bin/1.12.2
     env:
       LISP: ${{ matrix.lisp }}
-      QUICKLISP_DIST: ${{ matrix.quicklisp-dist }}
     steps:
       - uses: actions/checkout@v4
 
       - name: Setup Lisp
-        continue-on-error: true
-        uses: 40ants/setup-lisp@v2
+        uses: 40ants/setup-lisp@v4
         with:
           qlfile-template: |
-            {% ifequal quicklisp_dist "ultralisp" %}
             dist ultralisp http://dist.ultralisp.org
-            {% endifequal %}
 
       - name: Run tests (Non-Windows)
         if: runner.os != 'Windows'
         shell: bash
         run: |
           ros install neil-lindquist/ci-utils
+          asdf-register-project
           run-fiveam -e t -l frugal-uuid/test :frugal-uuid
           run-fiveam -e t -l frugal-uuid/non-frugal -l frugal-uuid/test :frugal-uuid
 
@@ -53,5 +52,6 @@ jobs:
         run: |
           ros --eval '(ql-dist:install-dist "http://dist.ultralisp.org/" :prompt nil)' --eval '(uiop:quit)'
           ros install neil-lindquist/ci-utils
+          asdf-register-project
           run-fiveam -e t -l frugal-uuid/test :frugal-uuid
           run-fiveam -e t -l frugal-uuid/non-frugal -l frugal-uuid/test :frugal-uuid
diff --git a/README.org b/README.org
@@ -47,7 +47,7 @@ draft]] and should be considered experimental.
 The following implementations and operating systems are tested via [[https://github.com/ak-coram/cl-frugal-uuid/blob/main/.github/workflows/CI.yml][CI]]:
 
 - [[https://sbcl.org/][SBCL]] (Linux, Windows, macOS)
-- [[https://ccl.clozure.com/][CCL]] (Linux, Windows, macOS)
+- [[https://ccl.clozure.com/][CCL]] (Linux)
 - [[https://ecl.common-lisp.dev/][ECL]] (Linux, macOS)
 
 ** Installation