Use Qlot for CI.

Author: fukamachi

.dockerignore

@@ -0,0 +1 @@
+.qlot

.gitignore

@@ -9,5 +9,3 @@
 
 t/test.db
 .qlot/
-qlfile
-qlfile.lock

docker-compose.yml

@@ -10,7 +10,8 @@ services:
         - LISP=${LISP:-sbcl}
     restart: "no"
     volumes:
-      - ./:/app/
+      - .:/app
+      - /app/.qlot
     depends_on:
       - postgres
       - mysql
@@ -26,7 +27,8 @@ services:
     container_name: mito-postgres
     image: "postgres:10"
     hostname: mito-test-postgres
-    restart: always
+    ports:
+      - "5432:5432"
     environment:
       POSTGRES_USER: mito
       POSTGRES_PASSWORD: mito
@@ -35,7 +37,8 @@ services:
     container_name: mito-mysql
     image: "mysql:8.4"
     hostname: mito-test-mysql
-    restart: always
+    ports:
+      - "3306:3306"
     command: --mysql_native_password=ON
     environment:
       MYSQL_ROOT_PASSWORD: mito

docker/Dockerfile

@@ -1,18 +1,30 @@
 ARG LISP=sbcl
+
+FROM fukamachi/qlot AS build-env
+
+WORKDIR /app
+COPY qlfile /app
+COPY qlfile.lock /app
+
+RUN qlot install --no-deps
+
 FROM fukamachi/${LISP} AS base
 
-RUN ros -e '(ql-dist:install-dist "http://dist.ultralisp.org/" :prompt nil)'
-RUN ros install fukamachi/cl-dbi rove
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
       libsqlite3-dev \
       default-libmysqlclient-dev \
       default-mysql-client && \
     rm -rf /var/lib/apt/lists/*
 
-COPY . /app
 WORKDIR /app
+RUN set -x; \
+  ros -e '(ql:update-dist "quicklisp" :prompt nil)' && \
+  ros install "fukamachi/qlot"
 
-ENV CL_SOURCE_REGISTRY "/app/"
+COPY --from=build-env /app/.qlot /app/.qlot
+
+COPY . /app
+RUN qlot install
 
 ENTRYPOINT "/app/docker/entrypoint.sh"

docker/entrypoint.sh

@@ -3,6 +3,8 @@
 set -x
 set -e
 
+qlot exec ros -s mito-test
+
 while ! mysql -u "$MYSQL_USER" \
         -h "$MYSQL_HOST" \
         -P "$MYSQL_PORT" \
@@ -11,5 +13,4 @@ while ! mysql -u "$MYSQL_USER" \
       sleep 1
 done
 
-ros -s mito-test
-rove mito-test.asd
+.qlot/bin/rove mito-test.asd

qlfile

@@ -0,0 +1,5 @@
+ql cl-dbi :upstream
+ql cl-mysql :upstream
+ql dissect :upstream
+ql sxql :upstream
+ql rove :upstream

qlfile.lock

@@ -0,0 +1,29 @@
+("quicklisp" .
+ (:class qlot/source/dist:source-dist
+  :initargs (:distribution "https://beta.quicklisp.org/dist/quicklisp.txt" :%version :latest)
+  :version "2023-10-21"))
+("cl-dbi" .
+ (:class qlot/source/ql:source-ql-upstream
+  :initargs nil
+  :version "ql-upstream-2ff41f0706180e140a31b844da4f0272e1a281cd"
+  :remote-url "https://github.com/fukamachi/cl-dbi.git"))
+("cl-mysql" .
+ (:class qlot/source/ql:source-ql-upstream
+  :initargs nil
+  :version "ql-upstream-b273cf772f13a525b534f5ee58bf36fb733204f3"
+  :remote-url "https://github.com/hackinghat/cl-mysql.git"))
+("dissect" .
+ (:class qlot/source/ql:source-ql-upstream
+  :initargs nil
+  :version "ql-upstream-a70cabcd748cf7c041196efd711e2dcca2bbbb2c"
+  :remote-url "https://github.com/Shinmera/dissect.git"))
+("sxql" .
+ (:class qlot/source/ql:source-ql-upstream
+  :initargs nil
+  :version "ql-upstream-c79c252bef276bb0343ced5149083e3b91d85d9b"
+  :remote-url "https://github.com/fukamachi/sxql.git"))
+("rove" .
+ (:class qlot/source/ql:source-ql-upstream
+  :initargs nil
+  :version "ql-upstream-cacea7331c10fe9d8398d104b2dfd579bf7ea353"
+  :remote-url "https://github.com/fukamachi/rove.git"))

t/util.lisp

@@ -34,8 +34,8 @@
                :port (parse-integer
                        (or (uiop:getenv "POSTGRES_PORT")
                            "5432"))
-               :username (or (uiop:getenv "POSTGRES_USER") "nobody")
-               :password (or (uiop:getenv "POSTGRES_PASS") "nobody")
+               :username (or (uiop:getenv "POSTGRES_USER") "mito")
+               :password (or (uiop:getenv "POSTGRES_PASS") "mito")
                :microsecond-precision t))
 
 (defun mysql-disconnect-from-testdb (conn)
@@ -44,12 +44,12 @@
 (defun mysql-connect-to-testdb ()
   (dbi:connect :mysql
                :database-name "mito"
-               :host (or (uiop:getenv "MYSQL_HOST") "localhost")
+               :host (or (uiop:getenv "MYSQL_HOST") "0.0.0.0")
                :port (parse-integer
                        (or (uiop:getenv "MYSQL_PORT")
                            "3306"))
-               :username (or (uiop:getenv "MYSQL_USER") "nobody")
-               :password (or (uiop:getenv "MYSQL_PASS") "nobody")))
+               :username (or (uiop:getenv "MYSQL_USER") "root")
+               :password (or (uiop:getenv "MYSQL_PASS") "mito")))
 
 (defun disconnect-from-testdb (conn)
   (funcall