ci: pin roswell version, change paths for qlot build

azimut · Nov 11, 2024 · 3f71936 · 3f71936
1 parent dea83ee
commit 3f71936
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -13,7 +13,7 @@ env:
   FREEALUT_VERSION: 1.1.0
   OPENAL_VERSION: 1.23.1
   SDL_VERSION: 2.0.12
-  LISP: sbcl-bin
+  LISP: sbcl-bin # needed for 40ants/setup-lisp
 
 jobs:
   build:
@@ -97,6 +97,7 @@ jobs:
       - uses: 40ants/setup-lisp@v4
         with:
           asdf-system: scenic
+          roswell-version: v23.10.14.114
           qlot-version: 1.5.15
 
       - name: Build Binary

diff --git a/bin/Makefile b/bin/Makefile
@@ -1,8 +1,8 @@
 OS ?= Linux
-SBCL ?= sbcl
+SBCL ?= qlot exec ros run
 
 AppDir/scenic:
-	$(SBCL) --non-interactive --load ./deploy.lisp
+	$(SBCL) --non-interactive --load bin/deploy.lisp
 ifeq ($(OS),Linux)
 	find . -name '*.so*' -exec strip {} \;
 	rm -vf AppDir/libstdc* # NOTE: bodge-ode dep

diff --git a/bin/deploy.lisp b/bin/deploy.lisp
@@ -2,7 +2,7 @@
   (load "~/quicklisp/setup.lisp"));; NOT NEEDED FOR QLOT
 
 (ql:quickload :deploy)
-(load "../scenic.asd") ;; QLOT WOULD RUN FROM ./ INSTEAD
+(load "scenic.asd")
 (ql:quickload :scenic)
 
 (deploy:define-library CL-OPENGL-BINDINGS::OPENGL :dont-deploy t)