From f4d7780bcb239c364b3d55b52d3acdfc5e716cd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81kos=20Kiss?= <ak@coram.pub>
Date: Fri, 12 Apr 2024 23:32:11 +0200
Subject: [PATCH] [WiP] Test

---
 .github/workflows/Benchmark.yml | 4 ----
 .github/workflows/CI.yml        | 4 +---
 .github/workflows/Nightly.yml   | 6 ++----
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/Benchmark.yml b/.github/workflows/Benchmark.yml
index ac69d07..4d3979e 100644
--- a/.github/workflows/Benchmark.yml
+++ b/.github/workflows/Benchmark.yml
@@ -31,10 +31,7 @@ jobs:
           unzip libduckdb-linux-amd64.zip -d .
 
       - name: Setup Lisp
-        continue-on-error: true
         uses: 40ants/setup-lisp@v4
-        with:
-          cache: false
 
       - name: Run benchmarks
         shell: bash
@@ -42,6 +39,5 @@ jobs:
           export LD_LIBRARY_PATH=./
           export CL_DUCKDB_USE_SFFI=t
           export CL_DUCKDB_LIBRARY_PATH="${{ github.workspace }}"
-          rm -f ~/.roswell/init.lisp || true
           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
index 976ec52..fa03e2c 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -63,10 +63,9 @@ jobs:
           7z x libduckdb-windows-amd64.zip
 
       - name: Setup Lisp
-        continue-on-error: true
         uses: 40ants/setup-lisp@v4
         with:
-          cache: false
+          cache: ${{ runner.os != 'macOS' }}
 
       - name: Run tests (Non-Windows)
         if: runner.os != 'Windows'
@@ -77,7 +76,6 @@ 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 -f ~/.roswell/init.lisp || true
           ros --eval '(ql-dist:install-dist "http://dist.ultralisp.org/" :prompt nil)' --eval '(uiop:quit)'
           ros install neil-lindquist/ci-utils
           asdf-register-project
diff --git a/.github/workflows/Nightly.yml b/.github/workflows/Nightly.yml
index 7784f32..2f2701d 100644
--- a/.github/workflows/Nightly.yml
+++ b/.github/workflows/Nightly.yml
@@ -66,11 +66,10 @@ jobs:
           7z x libduckdb-windows-amd64.zip
 
       - name: Setup Lisp
-        continue-on-error: true
         uses: 40ants/setup-lisp@v4
         with:
-          cache: false
-
+          cache: ${{ runner.os != 'macOS' }}
+          
       - name: Run tests (Non-Windows)
         if: runner.os != 'Windows'
         shell: bash
@@ -80,7 +79,6 @@ 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 -f ~/.roswell/init.lisp || true
           ros --eval '(ql-dist:install-dist "http://dist.ultralisp.org/" :prompt nil)' --eval '(uiop:quit)'
           ros install neil-lindquist/ci-utils
           asdf-register-project