Skip to content

Commit 39ca56e

Browse files
authored
Use Eask for CI (#388)
* Replace Cask with Eask * setup eask * Add package metadata * ci: fix makefile * Fix lint error * Add fail-fast * Revert and disable package main file * lint all
1 parent 0968038 commit 39ca56e

File tree

6 files changed

+56
-135
lines changed

6 files changed

+56
-135
lines changed

.github/workflows/test.yml

Lines changed: 12 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -9,62 +9,35 @@ on:
99
- master
1010

1111
jobs:
12-
unix-test:
12+
test:
1313
runs-on: ${{ matrix.os }}
1414
strategy:
15+
fail-fast: false
1516
matrix:
16-
os: [ubuntu-latest, macos-latest]
17+
os: [ubuntu-latest, macos-latest, windows-latest]
1718
emacs-version:
1819
- 26.1
1920
- 26.2
2021
- 26.3
2122
- 27.1
23+
- 27.2
24+
- 28.1
2225
- snapshot
2326

2427
steps:
25-
- uses: actions/checkout@v1
26-
27-
- uses: actions/setup-python@v2
28-
with:
29-
python-version: '3.6'
30-
architecture: 'x64'
28+
- uses: actions/checkout@v2
3129

32-
- uses: purcell/setup-emacs@master
30+
- uses: jcs090218/setup-emacs@master
3331
with:
3432
version: ${{ matrix.emacs-version }}
3533

36-
- uses: conao3/setup-cask@master
34+
- uses: actions/setup-node@v1
3735
with:
38-
version: 0.8.4
36+
node-version: '16'
3937

40-
- name: Run tests
41-
run: 'make unix-ci'
42-
43-
windows-test:
44-
runs-on: windows-latest
45-
strategy:
46-
matrix:
47-
emacs-version:
48-
- 26.1
49-
- 26.2
50-
- 26.3
51-
- 27.1
52-
- snapshot
53-
54-
steps:
55-
- uses: actions/checkout@v2
56-
57-
- uses: actions/setup-python@v2
58-
with:
59-
python-version: '3.6'
60-
architecture: 'x64'
61-
62-
- uses: jcs090218/setup-emacs-windows@master
38+
- uses: emacs-eask/setup-eask@master
6339
with:
64-
version: ${{ matrix.emacs-version }}
65-
66-
- name: Install depedencies
67-
run: "pip install python-language-server"
40+
version: 'snapshot'
6841

6942
- name: Run tests
70-
run: 'make windows-ci'
43+
run: 'make ci'

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
.cask
1+
.eask
2+
/dist
23
*.elc
34
tmp/
45
/install/.mvn/wrapper/maven-wrapper.jar

Cask

Lines changed: 0 additions & 11 deletions
This file was deleted.

Eask

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
(package "lsp-java"
2+
"3.0"
3+
"Java support for lsp-mode")
4+
5+
;; XXX: Linter will report errors because of the package main file; let's
6+
;; disable this for now!
7+
;;(package-file "lsp-java.el")
8+
9+
(files "*.el")
10+
11+
(source "gnu")
12+
(source "melpa")
13+
14+
(depends-on "emacs" "26.1")
15+
(depends-on "lsp-mode")
16+
(depends-on "markdown-mode")
17+
(depends-on "dash")
18+
(depends-on "f")
19+
(depends-on "ht")
20+
(depends-on "request")
21+
(depends-on "treemacs")
22+
(depends-on "dap-mode")
23+
24+
(development
25+
(depends-on "spinner")
26+
(depends-on "ecukes")
27+
(depends-on "espuds"))
28+
29+
(setq network-security-level 'low) ; see https://github.com/jcs090218/setup-emacs-windows/issues/156#issuecomment-932956432

Makefile

Lines changed: 13 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,28 @@
11
SHELL=/usr/bin/env bash
22

33
EMACS ?= emacs
4-
CASK ?= cask
5-
6-
INIT="(progn \
7-
(require 'package) \
8-
(push '(\"melpa\" . \"https://melpa.org/packages/\") package-archives) \
9-
(package-initialize) \
10-
(package-refresh-contents))"
11-
12-
LINT="(progn \
13-
(unless (package-installed-p 'package-lint) \
14-
(package-install 'package-lint)) \
15-
(require 'package-lint) \
16-
(package-lint-batch-and-exit))"
4+
EASK ?= eask
175

186
build:
19-
cask install
20-
21-
unix-ci: build unix-compile checkdoc lint
7+
$(EASK) package
8+
$(EASK) install
229

23-
windows-ci: CASK=
24-
windows-ci: clean windows-compile checkdoc lint
10+
ci: build compile checkdoc lint
2511

26-
unix-compile:
12+
compile:
2713
@echo "Compiling..."
28-
@$(CASK) $(EMACS) -Q --batch \
29-
-L . \
30-
--eval '(setq byte-compile-error-on-warn t)' \
31-
-f batch-byte-compile \
32-
*.el
33-
34-
windows-compile:
35-
@echo "Compiling..."
36-
@$(CASK) $(EMACS) -Q --batch \
37-
-l test/windows-bootstrap.el \
38-
-L . -L clients \
39-
--eval '(setq byte-compile-error-on-warn t)' \
40-
-f batch-byte-compile $(LSP-FILES)
14+
@$(EASK) compile
4115

16+
# TODO: We cannot lint dap-mode
4217
lint:
4318
@echo "package linting..."
44-
@$(CASK) $(EMACS) -Q --batch \
45-
-L . \
46-
--eval $(INIT) \
47-
--eval $(LINT) \
48-
*.el
19+
@$(EASK) lint
4920

5021
clean:
51-
rm -rf .cask
22+
$(EASK) clean-all
23+
24+
# TODO: do we have tests?
25+
test:
26+
$(EASK) install-deps --dev
5227

5328
.PHONY: build test compile checkdoc lint

test/windows-bootstrap.el

Lines changed: 0 additions & 46 deletions
This file was deleted.

0 commit comments

Comments
 (0)