Skip to content

Commit b1aa226

Browse files
committed
Transition to eldev from cask
1 parent 6ba5f8c commit b1aa226

File tree

5 files changed

+26
-43
lines changed

5 files changed

+26
-43
lines changed

.github/workflows/test.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,12 @@ jobs:
2525
python-version: 3.9
2626
- name: Install requirements
2727
run: |
28-
git clone https://github.com/cask/cask emacs-cask
29-
export PATH=$PWD/emacs-cask/bin:$PATH
30-
# Make cask available to all future actions
31-
echo "$PWD/emacs-cask/bin" >> $GITHUB_PATH
32-
3328
conda install -c conda-forge pandoc
3429
conda install -c anaconda jupyter
35-
make dev
30+
curl -fsSL https://raw.github.com/doublep/eldev/master/webinstall/eldev | sh
31+
32+
# Make eldev available to all future actions
33+
echo "$HOME/.local/bin" >> $GITHUB_PATH
3634
- name: Check Jupyter version
3735
run: |
3836
mkdir -p $(jupyter --runtime-dir)

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,5 @@ node_modules/
55
*lock*
66
built/
77
.cask/
8+
.eldev/
9+
Eldev-local

Cask

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

Eldev

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
; -*- mode: emacs-lisp; lexical-binding: t -*-
2+
3+
(eldev-require-version "1.2")
4+
(eldev-use-package-archive 'melpa)
5+
(eldev-add-extra-dependencies 'test 'org)
6+
(setq eldev-standard-excludes `(:or ,eldev-standard-excludes "./js"))

Makefile

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
EMACS ?= emacs
2-
CASK ?= $(shell command -v cask)
2+
ELDEV ?= $(shell command -v eldev)
33

44
FILES = $(wildcard *.el)
55
ELCFILES = $(FILES:.el=.elc)
@@ -8,51 +8,43 @@ TESTSELECTORS =
88

99
ifneq ($(TAGS),)
1010
comma := ,
11-
TESTSELECTORS := $(foreach tag,$(subst $(comma), ,$(TAGS)),(tag $(tag)))
11+
TESTSELECTORS := $(foreach tag,$(subst $(comma), ,$(TAGS)),\"(tag $(tag))\")
1212
endif
1313

1414
ifneq ($(PATTERN),)
1515
TESTSELECTORS := $(TESTSELECTORS) \"$(PATTERN)\"
1616
endif
1717

18-
ifneq ($(TESTSELECTORS),)
19-
TESTSELECTORS := (quote (or $(TESTSELECTORS)))
20-
endif
18+
# ifneq ($(TESTSELECTORS),)
19+
# TESTSELECTORS := (quote (or $(TESTSELECTORS)))
20+
# endif
2121

2222
.PHONY: all
2323
all: compile
2424

25-
.PHONY: cask
26-
cask:
27-
ifeq ($(CASK),)
28-
$(error "Install cask (https://github.com/cask/cask)")
25+
.PHONY: eldev
26+
eldev:
27+
ifeq ($(ELDEV),)
28+
$(error "Install eldev (https://github.com/doublep/eldev)")
2929
endif
3030

31-
.PHONY: dev
32-
dev: cask
33-
$(CASK) install
34-
$(CASK) update
35-
36-
test: export EMACSLOADPATH = $(shell $(CASK) load-path)
37-
3831
.PHONY: test
3932
test:
40-
$(EMACS) -nw -Q -batch -l ert $(TESTFILES) \
41-
--eval "(ert-run-tests-batch-and-exit $(TESTSELECTORS))"
33+
$(ELDEV) test $(TESTSELECTORS)
4234

4335
.PHONY: clean
4436
clean:
4537
make -C js clean
4638
@rm $(ELCFILES) 2>/dev/null || true
4739

48-
.PHONY: clean-cask
49-
clean-cask:
50-
@rm -rf .cask/ 2>/dev/null || true
40+
.PHONY: clean-eldev
41+
clean-eldev:
42+
@rm -rf .eldev/ 2>/dev/null || true
5143

5244
.PHONY: widgets
5345
widgets:
5446
make -C js
5547

5648
.PHONY: compile
5749
compile:
58-
$(CASK) build
50+
$(ELDEV) compile

0 commit comments

Comments
 (0)