Skip to content

Commit 71bcd38

Browse files
authored
add newer emacsen to CI matrix (#131)
Reworked the CI to do what flycheck does these days, it runs emacs in docker. The old makefile based emacs installation is busted for emacs26+, emacs26 fails to build gnutls and can't connect to melpa and the makefile doesn't even consider emacs27.
1 parent ab25cf3 commit 71bcd38

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

.travis.yml

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,23 @@ matrix:
44
fast_finish: true
55
# Allow snapshot to fail
66
allow_failures:
7-
- env: EMACS_VERSION=snapshot
8-
cache:
9-
- directories:
10-
- .cask/
7+
- env: EMACS_VERSION="master"
8+
services:
9+
- docker
1110
env:
1211
matrix:
13-
- EMACS_VERSION=24.4
14-
- EMACS_VERSION=24.5
15-
- EMACS_VERSION=25.1
16-
- EMACS_VERSION=25.2
17-
- EMACS_VERSION=snapshot
12+
- EMACS_VERSION="25.3"
13+
- EMACS_VERSION="26.3"
14+
- EMACS_VERSION="27.1"
15+
- EMACS_VERSION="master"
1816
before_install:
19-
- export PATH="$HOME/bin:$PATH"
20-
- wget 'https://raw.githubusercontent.com/flycheck/emacs-travis/master/emacs-travis.mk'
21-
- make -f emacs-travis.mk install_emacs
22-
- make -f emacs-travis.mk install_cask
23-
- emacs --version
24-
install:
25-
- cask install
17+
- docker pull flycheck/emacs-cask:$EMACS_VERSION
2618
script:
27-
- make compile test
19+
- |
20+
docker run --volume "$TRAVIS_BUILD_DIR":/puppet-mode \
21+
--workdir /puppet-mode \
22+
flycheck/emacs-cask:$EMACS_VERSION \
23+
/bin/bash -c "make compile test"
2824
notifications:
2925
email: false
3026
webhooks: https://voxpupu.li/incoming/travis

Makefile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,9 @@ test: $(PKGDIR)
2424
$(CASK) exec $(EMACS) -Q --batch $(EMACSFLAGS) -f batch-byte-compile $<
2525

2626
$(PKGDIR) : Cask
27-
$(CASK) install
27+
@# this is a load bearing --verbose
28+
@# without it pkg-info fails to install in emacs 25.3 with the error
29+
@# Dependency pkg-info failed to install: Wrong type argument: stringp, nil
30+
@# Most likely a bug in cask.
31+
$(CASK) --verbose install
2832
touch $(PKGDIR)

0 commit comments

Comments
 (0)