[WiP] Test

ak-coram · Apr 16, 2024 · f4d7780 · f4d7780
1 parent 9a8630c
commit f4d7780
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git a/.github/workflows/Benchmark.yml b/.github/workflows/Benchmark.yml
@@ -31,17 +31,13 @@ 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
         run: |
           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
@@ -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
@@ -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