Skip to content

Commit e112ef1

Browse files
committed
Replace Cask with Eask
1 parent 37a0411 commit e112ef1

5 files changed

Lines changed: 61 additions & 58 deletions

File tree

.github/workflows/test.yml

Lines changed: 33 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -7,38 +7,36 @@ on:
77
pull_request:
88

99
jobs:
10-
unix-test:
11-
runs-on: ubuntu-latest
12-
strategy:
13-
matrix:
14-
emacs-version:
15-
- 27.2
16-
- snapshot
17-
18-
steps:
19-
- uses: actions/checkout@v2
20-
21-
- uses: actions/setup-python@v2
22-
with:
23-
python-version: "3.6"
24-
architecture: "x64"
25-
26-
- uses: purcell/setup-emacs@master
27-
with:
28-
version: ${{ matrix.emacs-version }}
29-
30-
- uses: cask/setup-cask@master
31-
with:
32-
version: 'snapshot'
33-
34-
- name: Setup cmake
35-
uses: jwlawson/[email protected]
36-
with:
37-
cmake-version: '3.18.x'
38-
39-
- name: Check cmake
40-
run: "cmake --version"
41-
42-
- name: Run tests
43-
run:
44-
make unix-ci
10+
test:
11+
runs-on: ${{ matrix.os }}
12+
strategy:
13+
matrix:
14+
os: [ubuntu-latest, macos-latest, windows-latest]
15+
emacs-version:
16+
- 27.2
17+
- snapshot
18+
19+
steps:
20+
- uses: actions/checkout@v2
21+
22+
- uses: purcell/setup-emacs@master
23+
if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest'
24+
with:
25+
version: ${{ matrix.emacs-version }}
26+
27+
- uses: jcs090218/setup-emacs-windows@master
28+
if: matrix.os == 'windows-latest'
29+
with:
30+
version: ${{ matrix.emacs-version }}
31+
32+
- uses: actions/setup-node@v2
33+
with:
34+
node-version: '14'
35+
36+
- uses: emacs-eask/setup-eask@master
37+
with:
38+
version: 'snapshot'
39+
40+
- name: Run tests
41+
run:
42+
make ci

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
/.cask/
2+
/.eask/
23
*.elc

Cask

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

Eask

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
(source "gnu")
2+
(source "melpa")
3+
4+
(package-file "popup.el")
5+
6+
(development
7+
(depends-on "ert"))
8+
9+
(setq network-security-level 'low ; see https://github.com/jcs090218/setup-emacs-windows/issues/156#issuecomment-932956432
10+
byte-compile-error-on-warn nil)

Makefile

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,30 @@
11
SHELL := /usr/bin/env bash
22

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

6-
PKG-FILES := popup.el
6+
TEST-FILES := $(shell ls test/grammarly-*.el)
77

8-
TEST-FILES := $(shell ls test/popup-*.el)
8+
.PHONY: clean checkdoc lint install compile unix-test
99

10-
.PHONY: clean checkdoc lint unix-build unix-compile unix-test
10+
ci: clean install compile
1111

12-
unix-ci: clean unix-build unix-compile
12+
clean:
13+
@echo "Cleaning..."
14+
$(EASK) clean-all
1315

14-
unix-build:
15-
$(CASK) install
16+
install:
17+
@echo "Installing..."
18+
$(EASK) install
1619

17-
unix-compile:
20+
compile:
1821
@echo "Compiling..."
19-
@$(CASK) $(EMACS) -Q --batch \
20-
-L . \
21-
--eval '(setq byte-compile-error-on-warn t)' \
22-
-f batch-byte-compile $(PKG-FILES)
22+
$(EASK) compile
23+
24+
lint:
25+
@echo "Linting..."
26+
$(EASK) lint
2327

2428
unix-test:
2529
@echo "Testing..."
26-
$(CASK) exec ert-runner -L . $(LOAD-TEST-FILES) -t '!no-win' -t '!org'
27-
28-
clean:
29-
rm -rf .cask *.elc
30+
$(EASK) exec ert-runner -L . $(LOAD-TEST-FILES) -t '!no-win' -t '!org'

0 commit comments

Comments
 (0)