Skip to content

Commit f877659

Browse files
authored
ci: improve ci (#23)
1 parent 97ff36b commit f877659

File tree

3 files changed

+37
-33
lines changed

3 files changed

+37
-33
lines changed

.github/workflows/test.yml

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,45 +3,34 @@ name: CI
33
on: [push, pull_request]
44

55
jobs:
6-
unix-test:
6+
test:
77
runs-on: ${{ matrix.os }}
88
strategy:
99
matrix:
10-
os: [ubuntu-latest, macos-latest]
10+
os: [ubuntu-latest, macos-latest, windows-latest]
1111
emacs-version:
1212
- 26.1
1313
- 26.2
1414
- 26.3
1515
- 27.1
16+
- 27.2
17+
- 28.1
1618
- snapshot
1719

1820
steps:
1921
- uses: actions/checkout@v2
2022

21-
- uses: purcell/setup-emacs@master
23+
- uses: jcs090218/setup-emacs@master
2224
with:
2325
version: ${{ matrix.emacs-version }}
2426

25-
- name: Run tests
26-
run: make ci
27-
28-
windows-test:
29-
runs-on: windows-latest
30-
strategy:
31-
matrix:
32-
emacs-version:
33-
- 26.1
34-
- 26.2
35-
- 26.3
36-
- 27.1
37-
- snapshot
38-
39-
steps:
40-
- uses: actions/checkout@v2
27+
- uses: actions/setup-node@v2
28+
with:
29+
node-version: '16'
4130

42-
- uses: jcs090218/setup-emacs-windows@master
31+
- uses: emacs-eask/setup-eask@master
4332
with:
44-
version: ${{ matrix.emacs-version }}
33+
version: 'snapshot'
4534

4635
- name: Run tests
4736
run: make ci

Eask

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
(package "lsp-sourcekit"
2+
"0.1"
3+
"sourcekit-lsp client for lsp-mode")
4+
5+
(package-file "lsp-sourcekit.el")
6+
7+
(files "*.el")
8+
9+
(source "gnu")
10+
(source "melpa")
11+
12+
(depends-on "emacs" "25.1")
13+
(depends-on "lsp-mode")
14+
15+
(setq network-security-level 'low) ; see https://github.com/jcs090218/setup-emacs-windows/issues/156#issuecomment-932956432

Makefile

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
.PHONY: all compile clean
22

33
EMACS ?= emacs
4-
CASK ?= cask
4+
EASK ?= eask
55

66
LSP-SOURCEKIT-GENERAL := lsp-sourcekit.el
77

8-
all:
9-
$(CASK) build
8+
ci: clean build compile checkdoc lint
109

1110
build:
12-
$(CASK) install
11+
$(EASK) package
12+
$(EASK) install
1313

1414
compile:
1515
@echo "Compiling..."
16-
@$(CASK) $(EMACS) -Q --batch \
17-
-l test/windows-bootstrap.el \
18-
-L . \
19-
--eval '(setq byte-compile-error-on-warn t)' \
20-
-f batch-byte-compile *.el
16+
@$(EASK) compile
2117

22-
ci: CASK=
23-
ci: clean compile
18+
checkdoc:
19+
$(EASK) checkdoc
20+
21+
lint:
22+
@echo "package linting..."
23+
$(EASK) lint
2424

2525
clean:
26-
rm -rf .cask *.elc
26+
$(EASK) clean-all

0 commit comments

Comments
 (0)