Update CI to work with multiple platforms (emacs-lsp#309)

* Add test for Emacs 27.1

* Add macOS to CI test

* Use python version 2

* Rename job name to unix-test

* Add windows test

* Update make command

* Update CI test for Windows

* Copy bootstrap from lsp-mode

* Update dependency list

* Update year

* Changed show report to open report

* Fix CI lint, add commentary

Author: jcs090218

.github/workflows/test.yml

@@ -9,20 +9,22 @@ on:
       - master
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
+  unix-test:
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
+        os: [ubuntu-latest, macos-latest]
         emacs-version:
           - 26.1
           - 26.2
           - 26.3
+          - 27.1
           - snapshot
 
     steps:
     - uses: actions/checkout@v1
 
-    - uses: actions/setup-python@v1.1.1
+    - uses: actions/setup-python@v2
       with:
         python-version: '3.6'
         architecture: 'x64'
@@ -36,4 +38,33 @@ jobs:
         version: 0.8.4
 
     - name: Run tests
-      run: 'make test'
+      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: Install depedencies
+      run: "pip install python-language-server"
+
+    - name: Run tests
+      run: 'make windows-ci'

Makefile

@@ -18,16 +18,27 @@ LINT="(progn \
 build:
 	cask install
 
-test: build compile checkdoc lint
+unix-ci: build unix-compile checkdoc lint
 
-compile:
+windows-ci: CASK=
+windows-ci: clean windows-compile checkdoc lint
+
+unix-compile:
 	@echo "Compiling..."
 	@$(CASK) $(EMACS) -Q --batch \
 		-L . \
 		--eval '(setq byte-compile-error-on-warn t)' \
 		-f batch-byte-compile \
 		*.el
 
+windows-compile:
+	@echo "Compiling..."
+	@$(CASK) $(EMACS) -Q --batch \
+		-l test/windows-bootstrap.el \
+		-L . -L clients \
+		--eval '(setq byte-compile-error-on-warn t)' \
+		-f batch-byte-compile $(LSP-FILES)
+
 lint:
 	@echo "package linting..."
 	@$(CASK) $(EMACS) -Q --batch \

dap-java.el

@@ -25,6 +25,8 @@
 
 ;;; Commentary:
 
+;; Java specific adapter for DAP mode
+
 ;;; Code:
 
 (require 'lsp-java)

lsp-jt.el

@@ -245,7 +245,7 @@
                             :command (lsp-put
                                       (lsp-make-command
                                        :title title
-                                       :command #'lsp-jt-show-report)
+                                       :command #'lsp-jt-report-open)
                                       :_face face))))
                (-map #'lsp-copy lenses)))))
        (funcall callback all-lenses lsp--cur-version)))

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 '(lsp-mode markdown-mode dash f ht dash-functional request treemacs dap-mode)))
+  (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