Merge pull request #91 from jcs-PR/ci

Add CI test for windows and macOS

Author: ericdallo

.github/workflows/test.yml

@@ -9,10 +9,11 @@ on:
       - master
 
 jobs:
-  tests:
-    runs-on: ubuntu-latest
+  unix-test:
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
+        os: [ubuntu-latest, macos-latest]
         emacs-version:
           - 26.1
           - 26.2
@@ -21,7 +22,7 @@ jobs:
           - snapshot
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
 
     - uses: actions/setup-python@v2
       with:
@@ -41,5 +42,30 @@ jobs:
         version: 0.8.4
 
     - name: Run tests
-      run: 'make ci'
+      run: 'make unix-ci'
 
+  windows-test:
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        emacs-version:
+          - 26.1
+          - 26.2
+          - 26.3
+          - 27.1
+          - snapshot
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: actions/setup-python@v2
+        with:
+          python-version: '3.6'
+          architecture: 'x64'
+
+      - uses: jcs090218/setup-emacs-windows@master
+        with:
+          version: ${{ matrix.emacs-version }}
+
+      - name: Run tests
+        run: 'make windows-ci'

Makefile

@@ -3,6 +3,8 @@ SHELL=/usr/bin/env bash
 EMACS ?= emacs
 CASK ?= cask
 
+WINDOWS-INSTALL=-l test/windows-bootstrap.el
+
 INIT="(progn \
   (require 'package) \
   (push '(\"melpa\" . \"https://melpa.org/packages/\") package-archives) \
@@ -16,14 +18,30 @@ LINT="(progn \
 		(setq package-lint-main-file \"lsp-dart.el\") \
 		(package-lint-batch-and-exit))"
 
+ARCHIVES-INIT="(progn \
+  (require 'package) \
+  (setq package-archives '((\"melpa\" . \"https://melpa.org/packages/\") \
+						   (\"gnu\" . \"https://elpa.gnu.org/packages/\"))))"
+
+# NOTE: Bad request occurs during Cask installation on macOS in Emacs
+# version 26.x. By setting variable `package-archives` manually resolved
+# this issue.
 build:
+	@$(CASK) $(EMACS) -Q --batch \
+		--eval $(ARCHIVES-INIT)
 	cask install
 
-ci: clean build compile checkdoc lint test
+
+unix-ci: WINDOWS-INSTALL=
+unix-ci: clean build compile checkdoc lint unix-test
+
+windows-ci: CASK=
+windows-ci: clean compile checkdoc lint windows-test
 
 compile:
 	@echo "Compiling..."
 	@$(CASK) $(EMACS) -Q --batch \
+		$(WINDOWS-INSTALL) \
 		-L . \
 		--eval '(setq byte-compile-error-on-warn t)' \
 		-f batch-byte-compile \
@@ -57,9 +75,17 @@ lint:
 		--eval $(LINT) \
 		*.el
 
-test:
+unix-test:
 	@$(CASK) exec ert-runner
 
+windows-test:
+	@$(EMACS) -Q --batch \
+		$(WINDOWS-INSTALL) \
+		-L . \
+		$(LOAD-TEST-FILES) \
+		--eval "(ert-run-tests-batch-and-exit \
+		'(and (not (tag no-win)) (not (tag org))))"
+
 clean:
 	rm -rf .cask *.elc
 
@@ -76,4 +102,4 @@ tag:
 %:
 	@:
 
-.PHONY : ci compile checkdoc lint test clean tag
+.PHONY : ci compile checkdoc lint unix-test windows-test clean tag

test/windows-bootstrap.el

@@ -0,0 +1,46 @@
+;;; windows-bootstrap.el --- Windows test bootstrap -*- lexical-binding: t; -*-
+;;
+;; Copyright (C) 2020-2021 emacs-lsp maintainers
+;;
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
+;;
+;;; Commentary:
+;;
+;;  Windows test bootstrap
+;;
+;;; Code:
+
+(require 'package)
+
+(setq user-emacs-directory (expand-file-name (make-temp-name ".emacs.d")
+                                             "~")
+      package-user-dir (expand-file-name (make-temp-name "tmp-elpa")
+                                         user-emacs-directory))
+
+(let* ((package-archives '(("melpa" . "https://melpa.org/packages/")
+                           ("gnu" . "https://elpa.gnu.org/packages/")))
+       (pkgs (append '(lsp-treemacs lsp-mode dap-mode f dash pkg-info dart-mode)
+                     '(el-mock ert-runner undercover spinner))))
+  (package-initialize)
+  (package-refresh-contents)
+
+  (mapc (lambda (pkg)
+          (unless (package-installed-p pkg)
+            (package-install pkg)))
+        pkgs)
+
+  (add-hook 'kill-emacs-hook
+            `(lambda () (delete-directory ,user-emacs-directory t))))
+
+;;; windows-bootstrap.el ends here