From 954eca02d0d27f6ce71be48d01ae4987029bca11 Mon Sep 17 00:00:00 2001
From: Dimitri Fontaine <dim@tapoueh.org>
Date: Thu, 9 May 2019 10:52:09 +0200
Subject: [PATCH] Optimize Travis-CI workload.

Before this patch Travis would build the pgloader image twice, one when
doing the `make clones save` command and another time when doing the main
command `make check`, that depends on Make targets that `make save` does not
build, such as buildapp.

Also, fix `make check-saved` to stop requiring that we save pgloader again.

Finally, use uiop:featurep to clean-up the code in the src/save.lisp file.
---
 .travis.yml   |  2 +-
 Makefile      |  2 +-
 src/save.lisp | 11 +++++------
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 533f764..99a7185 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,7 +24,7 @@ before_script:
   - make "CL=$LISP" clones save
 
 script:
-  - PGUSER=pgloader make "CL=$LISP" check
+  - PGUSER=pgloader make "CL=$LISP" check-saved
 
 notifications:
   email:
diff --git a/Makefile b/Makefile
index e5d89b8..c5cdc32 100644
--- a/Makefile
+++ b/Makefile
@@ -173,7 +173,7 @@ test: $(PGLOADER)
 save: ./src/save.lisp $(LISP_SRC)
 	$(CL) $(CL_OPTS) --load ./src/save.lisp
 
-check-saved: save
+check-saved:
 	$(MAKE) PGLOADER=$(realpath $(PGLOADER)) CL=$(CL) -C test regress
 
 clean-bundle:
diff --git a/src/save.lisp b/src/save.lisp
index 3623f06..def2492 100644
--- a/src/save.lisp
+++ b/src/save.lisp
@@ -77,9 +77,8 @@
                         :toplevel-function #'cl-user::pgloader-image-main
                         :prepend-kernel t)
   #+sbcl
-  (let ((compression (when (member :sb-core-compression cl:*features*) t)))
-    (sb-ext:save-lisp-and-die image-filename
-                              :toplevel #'cl-user::pgloader-image-main
-                              :executable t
-                              :save-runtime-options t
-                              :compression compression)))
+  (sb-ext:save-lisp-and-die image-filename
+                            :toplevel #'cl-user::pgloader-image-main
+                            :executable t
+                            :save-runtime-options t
+                            :compression (uiop:featurep :sb-core-compression)))