Merge pull request #450 from jcs-PR/ci

Improve CI process

Author: jcs090218

Makefile

@@ -28,14 +28,17 @@ build:
 unix-compile:
 	@$(CASK) $(EMACS) -Q --batch \
 	-L . \
-	--eval '(setq byte-compile-error-on-warn t treemacs-no-load-time-warnings t)' \
+	--eval '(setq treemacs-no-load-time-warnings t)' \
+	--eval '(setq byte-compile-error-on-warn t)' \
 	-f batch-byte-compile $(DAP-GENERAL) $(DAP-CLIENTS)
 
 windows-compile:
 	@$(CASK) $(EMACS) -Q --batch \
+	--eval '(setq emacs-lsp-ci t)' \
 	-l test/windows-bootstrap.el \
 	-L . \
-	--eval '(setq byte-compile-error-on-warn t treemacs-no-load-time-warnings t)' \
+	--eval '(setq treemacs-no-load-time-warnings t)' \
+	--eval '(setq byte-compile-error-on-warn t)' \
 	-f batch-byte-compile $(DAP-GENERAL) $(DAP-CLIENTS)
 
 unix-ci: clean build unix-compile unix-test
@@ -51,6 +54,7 @@ unix-test:
 
 windows-test:
 	@$(EMACS) -Q --batch \
+		--eval '(setq emacs-lsp-ci t)' \
 		-l test/windows-bootstrap.el \
 		-L . \
 		$(LOAD-TEST-FILES) \

test/windows-bootstrap.el

@@ -38,10 +38,12 @@
 
   (mapc (lambda (pkg)
           (unless (package-installed-p pkg)
-            (package-install pkg)))
+            (package-refresh-contents) (package-install pkg)))
         pkgs)
 
   (add-hook 'kill-emacs-hook
-            `(lambda () (delete-directory ,user-emacs-directory t))))
+            `(lambda ()
+               (unless (boundp 'emacs-lsp-ci)
+                 (delete-directory ,user-emacs-directory t)))))
 
 ;;; windows-bootstrap.el ends here