Skip to content

Commit b330241

Browse files
authored
Use Eask for CI (#128)
* Use Eask for CI * Rename job to just test * Apply eask command * code: include file * ci: fix network issue * Add fail fast
1 parent 355e468 commit b330241

File tree

6 files changed

+49
-96
lines changed

6 files changed

+49
-96
lines changed

.github/workflows/test.yml

Lines changed: 11 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,49 +3,35 @@ name: CI
33
on: [push, pull_request]
44

55
jobs:
6-
unix-test:
6+
test:
77
runs-on: ${{ matrix.os }}
88
strategy:
9+
fail-fast: false
910
matrix:
10-
os: [ubuntu-latest, macos-latest]
11+
os: [ubuntu-latest, macos-latest, windows-latest]
1112
emacs-version:
1213
- 26.1
1314
- 26.2
1415
- 26.3
1516
- 27.1
17+
- 27.2
18+
- 28.1
1619
- snapshot
1720

1821
steps:
1922
- uses: actions/checkout@v2
2023

21-
- uses: purcell/setup-emacs@master
24+
- uses: jcs090218/setup-emacs@master
2225
with:
2326
version: ${{ matrix.emacs-version }}
2427

25-
- uses: conao3/setup-cask@master
28+
- uses: actions/setup-node@v1
2629
with:
27-
version: 0.8.4
30+
node-version: '16'
2831

29-
- name: Run tests
30-
run: make unix-ci
31-
32-
windows-test:
33-
runs-on: windows-latest
34-
strategy:
35-
matrix:
36-
emacs-version:
37-
- 26.1
38-
- 26.2
39-
- 26.3
40-
- 27.1
41-
- snapshot
42-
43-
steps:
44-
- uses: actions/checkout@v2
45-
46-
- uses: jcs090218/setup-emacs-windows@master
32+
- uses: emacs-eask/setup-eask@master
4733
with:
48-
version: ${{ matrix.emacs-version }}
34+
version: 'snapshot'
4935

5036
- name: Run tests
51-
run: make windows-ci
37+
run: make ci

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
*.elc
2-
.cask
2+
.eask
3+
/dist

Cask

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

Eask

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
(package "lsp-treemacs"
2+
"0.4"
3+
"LSP treemacs")
4+
5+
(package-file "lsp-treemacs.el")
6+
7+
(files "*.el")
8+
9+
(source "gnu")
10+
(source "melpa")
11+
12+
(depends-on "emacs" "26.1")
13+
(depends-on "dash")
14+
(depends-on "f")
15+
(depends-on "ht")
16+
(depends-on "treemacs")
17+
(depends-on "lsp-mode")
18+
19+
(development
20+
(depends-on "spinner"))
21+
22+
(setq network-security-level 'low) ; see https://github.com/jcs090218/setup-emacs-windows/issues/156#issuecomment-932956432

Makefile

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,25 @@
1-
.PHONY: all build unix-compile windows-compile clean
2-
31
EMACS ?= emacs
4-
CASK ?= cask
2+
EASK ?= eask
3+
4+
.PHONY: all build compile clean
55

6-
LSP-TREEMACS-GENERAL := lsp-treemacs.el lsp-treemacs-themes.el
6+
ci: clean build compile
77

88
all:
9-
$(CASK) build
9+
$(EASK) build
1010

1111
build:
12-
$(CASK) install
13-
14-
# NOTE: treemacs also sets treemacs-no-load-time-warnings to t in its Makefile, so I guess it's OK?
15-
unix-compile:
16-
@$(CASK) $(EMACS) -Q --batch \
17-
-L . \
18-
--eval '(setq byte-compile-error-on-warn t)' \
19-
-f batch-byte-compile $(LSP-TREEMACS-GENERAL)
12+
$(EASK) package
13+
$(EASK) install
2014

21-
windows-compile:
22-
@$(CASK) $(EMACS) -Q --batch \
23-
-l test/windows-bootstrap.el \
24-
-L . \
25-
--eval '(setq byte-compile-error-on-warn t)' \
26-
-f batch-byte-compile $(LSP-TREEMACS-GENERAL)
15+
compile:
16+
$(EASK) compile
2717

28-
unix-ci: clean build unix-compile
18+
checkdoc:
19+
$(EASK) checkdoc
2920

30-
windows-ci: CASK=
31-
windows-ci: clean windows-compile
21+
lint:
22+
$(EASK) lint
3223

3324
clean:
34-
rm -rf .cask *.elc
25+
$(EASK) clean-all

test/windows-bootstrap.el

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

0 commit comments

Comments
 (0)