Skip to content

Commit 3bcd560

Browse files
authored
Merge pull request #5 from jcs-PR/test/eask
test: Build with Eask
2 parents 19ae6c1 + bd56f55 commit 3bcd560

File tree

5 files changed

+88
-14
lines changed

5 files changed

+88
-14
lines changed

.github/dependabot.yml

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: github-actions
4+
directory: /
5+
schedule:
6+
interval: daily

.github/workflows/test.yml

+51
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
pull_request:
8+
workflow_dispatch:
9+
10+
concurrency:
11+
group: ${{ github.workflow }}-${{ github.ref }}
12+
cancel-in-progress: true
13+
14+
jobs:
15+
test:
16+
runs-on: ${{ matrix.os }}
17+
continue-on-error: ${{ matrix.experimental }}
18+
strategy:
19+
fail-fast: false
20+
matrix:
21+
os: [ubuntu-latest, macos-latest, windows-latest]
22+
emacs-version:
23+
- 26.3
24+
- 27.2
25+
- 28.2
26+
- 29.1
27+
experimental: [false]
28+
include:
29+
- os: ubuntu-latest
30+
emacs-version: snapshot
31+
experimental: true
32+
- os: macos-latest
33+
emacs-version: snapshot
34+
experimental: true
35+
- os: windows-latest
36+
emacs-version: snapshot
37+
experimental: true
38+
39+
steps:
40+
- uses: actions/checkout@v4
41+
42+
- uses: jcs090218/setup-emacs@master
43+
with:
44+
version: ${{ matrix.emacs-version }}
45+
46+
- uses: emacs-eask/setup-eask@master
47+
with:
48+
version: 'snapshot'
49+
50+
- name: Run tests
51+
run: make ci

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@
22
*~
33
/*-autoloads.el
44
/.cask/
5+
/.eask/
6+
/dist

Eask

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
(package "muldoc"
2+
"0.4.0"
3+
"Multi ElDoc integration")
4+
5+
(website-url "https://github.com/emacs-php/muldoc")
6+
(keywords "tools" "extension")
7+
8+
(package-file "muldoc.el")
9+
10+
(script "test" "echo \"Error: no test specified\" && exit 1")
11+
12+
(source 'gnu)
13+
14+
(depends-on "emacs" "25.1")
15+
16+
(setq network-security-level 'low) ; see https://github.com/jcs090218/setup-emacs-windows/issues/156#issuecomment-932956432

Makefile

+13-14
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,22 @@
11
EMACS ?= emacs
2-
ELS = muldoc.el
3-
AUTOLOADS = muldoc-autoloads.el
4-
ELCS = $(ELS:.el=.elc)
2+
EASK ?= eask
53

6-
%.elc: %.el
7-
$(EMACS) -Q -batch -L . -f batch-byte-compile $<
4+
install:
5+
$(EASK) package
6+
$(EASK) install
87

9-
all: autoloads $(ELCS)
8+
compile:
9+
$(EASK) compile
1010

11-
autoloads: $(AUTOLOADS)
11+
ci: clean autoloads install compile
1212

13-
$(AUTOLOADS): $(ELS)
14-
$(EMACS) -Q -batch -L . --eval \
15-
"(progn \
16-
(require 'package) \
17-
(package-generate-autoloads \"muldoc\" default-directory))"
13+
all: autoloads compile
14+
15+
autoloads:
16+
$(EASK) generate autoloads
1817

1918
clean:
20-
rm -f $(ELCS) $(AUTOLOADS)
19+
$(EASK) clean all
2120

2221
test: clean all
23-
$(EMACS) -Q -batch -L . -l tests/muldoc-test.el -f ert-run-tests-batch-and-exit
22+
$(EASK) test ert tests/muldoc-test.el

0 commit comments

Comments
 (0)