branch: elpa/org-journal
commit 35789f9e0f4e6f82c007d6583436e38d273b3e26
Author: JenChieh <jcs090...@gmail.com>
Commit: JenChieh <jcs090...@gmail.com>
ci: Improve CI a bit
---
.github/workflows/test.yml | 41 ++++++++++++++++++++++++++++++-----------
.gitignore | 3 +++
Eask | 16 ++++++++++++++++
Makefile | 11 ++++-------
4 files changed, 53 insertions(+), 18 deletions(-)
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 954626e657..05b5e15e6c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -13,24 +13,43 @@ on:
jobs:
build:
- runs-on: ubuntu-latest
+ runs-on: ${{ matrix.os }}
continue-on-error: ${{ matrix.experimental }}
strategy:
+ fail-fast: false
matrix:
- emacs_version:
- - 26.1
- - 27.1
- - 28.1
- - 29.1
- - release-snapshot
+ os: [ubuntu-latest, macos-latest, windows-latest]
+ emacs-version:
+ - 26.3
+ - 27.2
+ - 28.2
+ - 29.4
+ - 30.1
experimental: [false]
include:
- - emacs_version: snapshot
- experimental: true
+ - os: ubuntu-latest
+ emacs-version: snapshot
+ experimental: true
+ - os: macos-latest
+ emacs-version: snapshot
+ experimental: true
+ - os: windows-latest
+ emacs-version: snapshot
+ experimental: true
+ exclude:
+ - os: macos-latest
+ emacs-version: 26.3
+ - os: macos-latest
+ emacs-version: 27.2
+
steps:
- - uses: purcell/setup-emacs@master
+ - uses: jcs090218/setup-emacs@master
+ with:
+ version: ${{ matrix.emacs-version }}
+
+ - uses: emacs-eask/setup-eask@master
with:
- version: ${{ matrix.emacs_version }}
+ version: 'snapshot'
- uses: actions/checkout@v4
diff --git a/.gitignore b/.gitignore
index e0062bb48e..351b6c50aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,5 @@
*.elc
/org-journal-autoloads.el
+
+/.eask
+/dist
diff --git a/Eask b/Eask
new file mode 100644
index 0000000000..85e26aa753
--- /dev/null
+++ b/Eask
@@ -0,0 +1,16 @@
+;; -*- mode: eask; lexical-binding: t -*-
+
+(package "org-journal"
+ "2.2.0"
+ "a simple org-mode based journaling mode")
+
+(website-url "http://github.com/bastibe/org-journal";)
+
+(package-file "org-journal.el")
+
+(script "test" "echo \"Error: no test specified\" && exit 1")
+
+(source 'gnu)
+
+(depends-on "emacs" "26.1")
+(depends-on "org")
diff --git a/Makefile b/Makefile
index 5edb6c0940..7b67f92de7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
EMACS = emacs
+EASK = eask
BATCH = $(EMACS) -Q -batch -L .
export LC_ALL=C
@@ -10,14 +11,10 @@ clean:
git clean -Xf
compile:
- $(BATCH) -f batch-byte-compile org-journal.el
+ $(EASK) compile
gen-autoloads:
- $(BATCH) \
- --eval "(require 'autoload)" \
- --eval '(setq make-backup-files nil)' \
- --eval "(setq generated-autoload-file (concat
command-line-default-directory \"/\" \"org-journal-autoloads.el\"))" \
- -f batch-update-autoloads "."
+ $(EASK) generate autoloads
test:
- $(BATCH) -l tests/org-journal-test -f ert-run-tests-batch-and-exit
+ $(EASK) test ert ./tests/*.el
