Skip to content

Commit 35789f9

Browse files
committed
ci: Improve CI a bit
1 parent e581bf5 commit 35789f9

File tree

4 files changed

+53
-18
lines changed

4 files changed

+53
-18
lines changed

.github/workflows/test.yml

Lines changed: 30 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,43 @@ on:
1313

1414
jobs:
1515
build:
16-
runs-on: ubuntu-latest
16+
runs-on: ${{ matrix.os }}
1717
continue-on-error: ${{ matrix.experimental }}
1818
strategy:
19+
fail-fast: false
1920
matrix:
20-
emacs_version:
21-
- 26.1
22-
- 27.1
23-
- 28.1
24-
- 29.1
25-
- release-snapshot
21+
os: [ubuntu-latest, macos-latest, windows-latest]
22+
emacs-version:
23+
- 26.3
24+
- 27.2
25+
- 28.2
26+
- 29.4
27+
- 30.1
2628
experimental: [false]
2729
include:
28-
- emacs_version: snapshot
29-
experimental: true
30+
- os: ubuntu-latest
31+
emacs-version: snapshot
32+
experimental: true
33+
- os: macos-latest
34+
emacs-version: snapshot
35+
experimental: true
36+
- os: windows-latest
37+
emacs-version: snapshot
38+
experimental: true
39+
exclude:
40+
- os: macos-latest
41+
emacs-version: 26.3
42+
- os: macos-latest
43+
emacs-version: 27.2
44+
3045
steps:
31-
- uses: purcell/setup-emacs@master
46+
- uses: jcs090218/setup-emacs@master
47+
with:
48+
version: ${{ matrix.emacs-version }}
49+
50+
- uses: emacs-eask/setup-eask@master
3251
with:
33-
version: ${{ matrix.emacs_version }}
52+
version: 'snapshot'
3453

3554
- uses: actions/checkout@v4
3655

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
*.elc
22
/org-journal-autoloads.el
3+
4+
/.eask
5+
/dist

Eask

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
;; -*- mode: eask; lexical-binding: t -*-
2+
3+
(package "org-journal"
4+
"2.2.0"
5+
"a simple org-mode based journaling mode")
6+
7+
(website-url "http://github.com/bastibe/org-journal")
8+
9+
(package-file "org-journal.el")
10+
11+
(script "test" "echo \"Error: no test specified\" && exit 1")
12+
13+
(source 'gnu)
14+
15+
(depends-on "emacs" "26.1")
16+
(depends-on "org")

Makefile

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
EMACS = emacs
2+
EASK = eask
23
BATCH = $(EMACS) -Q -batch -L .
34

45
export LC_ALL=C
@@ -10,14 +11,10 @@ clean:
1011
git clean -Xf
1112

1213
compile:
13-
$(BATCH) -f batch-byte-compile org-journal.el
14+
$(EASK) compile
1415

1516
gen-autoloads:
16-
$(BATCH) \
17-
--eval "(require 'autoload)" \
18-
--eval '(setq make-backup-files nil)' \
19-
--eval "(setq generated-autoload-file (concat command-line-default-directory \"/\" \"org-journal-autoloads.el\"))" \
20-
-f batch-update-autoloads "."
17+
$(EASK) generate autoloads
2118

2219
test:
23-
$(BATCH) -l tests/org-journal-test -f ert-run-tests-batch-and-exit
20+
$(EASK) test ert ./tests/*.el

0 commit comments

Comments
 (0)