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.
This commit is contained in:
Dimitri Fontaine 2019-05-09 10:52:09 +02:00
parent 351ce3faaf
commit 954eca02d0
3 changed files with 7 additions and 8 deletions

View File

@ -24,7 +24,7 @@ before_script:
- make "CL=$LISP" clones save - make "CL=$LISP" clones save
script: script:
- PGUSER=pgloader make "CL=$LISP" check - PGUSER=pgloader make "CL=$LISP" check-saved
notifications: notifications:
email: email:

View File

@ -173,7 +173,7 @@ test: $(PGLOADER)
save: ./src/save.lisp $(LISP_SRC) save: ./src/save.lisp $(LISP_SRC)
$(CL) $(CL_OPTS) --load ./src/save.lisp $(CL) $(CL_OPTS) --load ./src/save.lisp
check-saved: save check-saved:
$(MAKE) PGLOADER=$(realpath $(PGLOADER)) CL=$(CL) -C test regress $(MAKE) PGLOADER=$(realpath $(PGLOADER)) CL=$(CL) -C test regress
clean-bundle: clean-bundle:

View File

@ -77,9 +77,8 @@
:toplevel-function #'cl-user::pgloader-image-main :toplevel-function #'cl-user::pgloader-image-main
:prepend-kernel t) :prepend-kernel t)
#+sbcl #+sbcl
(let ((compression (when (member :sb-core-compression cl:*features*) t))) (sb-ext:save-lisp-and-die image-filename
(sb-ext:save-lisp-and-die image-filename :toplevel #'cl-user::pgloader-image-main
:toplevel #'cl-user::pgloader-image-main :executable t
:executable t :save-runtime-options t
:save-runtime-options t :compression (uiop:featurep :sb-core-compression)))
:compression compression)))