Bump 40ants/setup-lisp to v4 in workflows

ak-coram · Apr 12, 2024 · 6c75d6e · 6c75d6e
1 parent 7df7557
commit 6c75d6e
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 27 deletions.
diff --git a/.github/workflows/Benchmark.yml b/.github/workflows/Benchmark.yml
@@ -32,15 +32,16 @@ jobs:
 
       - 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
+          cache: false
 
       - name: Run benchmarks
         shell: bash
         run: |
           export LD_LIBRARY_PATH=./
           export CL_DUCKDB_USE_SFFI=t
           export CL_DUCKDB_LIBRARY_PATH="${{ github.workspace }}"
+          rm ~/.roswell/init.lisp
+          ros --eval '(ql-dist:install-dist "http://dist.ultralisp.org/" :prompt nil)' --eval '(uiop:quit)'
           ros run --eval '(progn (ql:quickload :duckdb/benchmark) (asdf:test-system :duckdb/benchmark) (quit))'
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -13,15 +13,13 @@ on:
 
 jobs:
   test:
-    name: ${{ matrix.lisp }} (${{ matrix.cffi }}) / ${{ matrix.quicklisp-dist }} on ${{ matrix.os }} with duckdb ${{ matrix.duckdb }}
+    name: ${{ matrix.lisp }} (${{ matrix.cffi }}) on ${{ matrix.os }} with duckdb ${{ matrix.duckdb }}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         lisp: [sbcl-bin, ccl-bin/1.12.2, ecl/23.9.9]
         os: [ubuntu-latest, windows-latest, macos-13, macos-14]
-        quicklisp-dist:
-          - ultralisp
         duckdb: [0.10.1]
         cffi: [default, static]
         exclude:
@@ -33,10 +31,11 @@ jobs:
             lisp: ccl-bin/1.12.2
           - os: windows-latest
             lisp: ecl/23.9.9
+          - os: macos-14
+            lisp: ccl-bin/1.12.2
     env:
       LISP: ${{ matrix.lisp }}
       DUCKDB_VERSION: ${{ matrix.duckdb }}
-      QUICKLISP_DIST: ${{ matrix.quicklisp-dist }}
     steps:
       - uses: actions/checkout@v4
 
@@ -65,12 +64,9 @@ jobs:
 
       - 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 %}
+          cache: false
 
       - name: Run tests (Non-Windows)
         if: runner.os != 'Windows'
@@ -81,6 +77,7 @@ jobs:
           if [ ${{ matrix.cffi }} = 'static' ]; then export CL_DUCKDB_USE_SFFI=t; fi
           export CL_DUCKDB_LIBRARY_PATH="${{ github.workspace }}"
           if [ ${{ matrix.os }} = 'macos-latest' ]; then sudo cp ./libduckdb.dylib /usr/local/lib/; fi
+          rm ~/.roswell/init.lisp
           ros install neil-lindquist/ci-utils
           asdf-register-project
           run-fiveam -e t -l duckdb/test :duckdb
@@ -92,7 +89,5 @@ jobs:
           if [ ${{ matrix.cffi }} = 'static' ]; then export CL_DUCKDB_USE_SFFI=t; fi
           export CL_DUCKDB_LIBRARY_PATH="${{ github.workspace }}"
           pacman --noconfirm -S mingw-w64-x86_64-pkg-config mingw-w64-x86_64-libffi
-          ros --eval '(ql-dist:install-dist "http://dist.ultralisp.org/" :prompt nil)' --eval '(ql:quickload :cffi-grovel)' --eval "(progn (setf cffi-grovel::*cc-flags* (append (list \"-I`cygpath -w /mingw64/include`\") cffi-grovel::*cc-flags*)) (ql:quickload :cffi-libffi))" --eval '(uiop:quit)'
-          ros install neil-lindquist/ci-utils
-          asdf-register-project
-          run-fiveam -e t -l duckdb/test :duckdb
+          ros --eval '(ql-dist:install-dist "http://dist.ultralisp.org/" :prompt nil)' --eval '(uiop:quit)'
+          ros --eval '(ql:quickload :cffi-grovel)' --eval "(progn (setf cffi-grovel::*cc-flags* (append (list \"-I`cygpath -w /mingw64/include`\") cffi-grovel::*cc-flags*)) (ql:quickload :cffi-libffi))" --eval "(progn (ql:quickload :duckdb/test) (uiop:quit (if (uiop:symbol-call :fiveam '#:run! :duckdb) 0 1)))"
diff --git a/.github/workflows/Nightly.yml b/.github/workflows/Nightly.yml
@@ -13,7 +13,7 @@ on:
 
 jobs:
   test:
-    name: ${{ matrix.lisp }} (${{ matrix.cffi }}) / ${{ matrix.quicklisp-dist }} on ${{ matrix.os }} with duckdb nightly
+    name: ${{ matrix.lisp }} (${{ matrix.cffi }}) on ${{ matrix.os }} with duckdb nightly
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
@@ -32,9 +32,10 @@ jobs:
             lisp: ccl-bin/1.12.2
           - os: windows-latest
             lisp: ecl/23.9.9
+          - os: macos-14
+            lisp: ccl-bin/1.12.2
     env:
       LISP: ${{ matrix.lisp }}
-      QUICKLISP_DIST: ${{ matrix.quicklisp-dist }}
     steps:
       - uses: actions/checkout@v4
 
@@ -66,12 +67,9 @@ jobs:
 
       - 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 %}
+          cache: false
 
       - name: Run tests (Non-Windows)
         if: runner.os != 'Windows'
@@ -82,6 +80,7 @@ jobs:
           if [ ${{ matrix.cffi }} = 'static' ]; then export CL_DUCKDB_USE_SFFI=t; fi
           export CL_DUCKDB_LIBRARY_PATH="${{ github.workspace }}"
           if [ ${{ matrix.os }} = 'macos-latest' ]; then sudo cp ./libduckdb.dylib /usr/local/lib/; fi
+          rm ~/.roswell/init.lisp
           ros install neil-lindquist/ci-utils
           asdf-register-project
           run-fiveam -e t -l duckdb/test :duckdb
@@ -93,7 +92,5 @@ jobs:
           if [ ${{ matrix.cffi }} = 'static' ]; then export CL_DUCKDB_USE_SFFI=t; fi
           export CL_DUCKDB_LIBRARY_PATH="${{ github.workspace }}"
           pacman --noconfirm -S mingw-w64-x86_64-pkg-config mingw-w64-x86_64-libffi
-          ros --eval '(ql-dist:install-dist "http://dist.ultralisp.org/" :prompt nil)' --eval '(ql:quickload :cffi-grovel)' --eval "(progn (setf cffi-grovel::*cc-flags* (append (list \"-I`cygpath -w /mingw64/include`\") cffi-grovel::*cc-flags*)) (ql:quickload :cffi-libffi))" --eval '(uiop:quit)'
-          ros install neil-lindquist/ci-utils
-          asdf-register-project
-          run-fiveam -e t -l duckdb/test :duckdb
+          ros --eval '(ql-dist:install-dist "http://dist.ultralisp.org/" :prompt nil)' --eval '(uiop:quit)'
+          ros --eval '(ql:quickload :cffi-grovel)' --eval "(progn (setf cffi-grovel::*cc-flags* (append (list \"-I`cygpath -w /mingw64/include`\") cffi-grovel::*cc-flags*)) (ql:quickload :cffi-libffi))" --eval "(progn (ql:quickload :duckdb/test) (uiop:quit (if (uiop:symbol-call :fiveam '#:run! :duckdb) 0 1)))"