branch: elpa/parseclj
commit 4fc37462ab646a25abd8d61c78bdaf91681381d2
Author: Arne Brasseur <[email protected]>
Commit: Arne Brasseur <[email protected]>
Make Travis use Cask
---
.travis.yml | 25 +++++++++++++-----------
clj-parse-test-runner.el | 50 ------------------------------------------------
2 files changed, 14 insertions(+), 61 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 16e2a68de7..5cfcd11bb1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,20 +1,23 @@
language: generic
dist: trusty
env:
- - VERSION=25.2.2 EMACS=emacs-25.2 PACKAGE=emacs25
- - VERSION=25.2.2 EMACS=emacs-25.2 PACKAGE=emacs25 CLJ_PARSE_LINT=true
-
+ - EMACS=emacs25
+ - EMACS=emacs-snapshot
matrix:
allow_failures:
- - env: VERSION=25.2.2 EMACS=emacs-25.2 PACKAGE=emacs25 CLJ_PARSE_LINT=true
-
+ - env: EMACS=emacs-snapshot
before_install:
+ # Emacs 25
- sudo add-apt-repository -y ppa:kelleyk/emacs
+ # Nightly Emacs snapshot builds
+ - sudo add-apt-repository -y ppa:ubuntu-elisp/ppa
+ # Update and install the Emacs for our environment
- sudo apt-get update -qq
- - sudo apt-get install -qq $PACKAGE
-
+ - sudo apt-get install -qq -yy ${EMACS}
+ # Install and bootstrap cask
+ - travis_retry sh -c 'curl -fsSkL https://raw.github.com/cask/cask/master/go
| python'
+ - export PATH="${HOME}/.cask/bin:$PATH"
+install:
+ - cask install
script:
- - $EMACS --version
- - ls /usr/bin /usr/local/bin | grep emacs
- - $EMACS --version | grep $VERSION
- - $EMACS -batch -l clj-parse-test-runner.el
+ - cask exec ert-runner
diff --git a/clj-parse-test-runner.el b/clj-parse-test-runner.el
deleted file mode 100644
index e10bd27e8f..0000000000
--- a/clj-parse-test-runner.el
+++ /dev/null
@@ -1,50 +0,0 @@
-;; Script used for the Travis build
-
-(setq package-archives
- '(("gnu" . "https://elpa.gnu.org/packages/";)
- ("melpa" . "https://melpa.org/packages/";)
- ("melpa-stable" . "https://stable.melpa.org/packages/";)
- ("plexus-elpa" . "https://plexus.github.io/elpa/";)))
-
-
-(package-initialize)
-(package-refresh-contents)
-
-;; Emacs before 25.1
-(when (not (fboundp 'let-alist))
- (package-install 'let-alist))
-
-(package-install 'package-lint)
-(package-install 'a)
-(package-install 'dash)
-(package-install 'edn) ;; required for the edn test suite
-
-(setq clj-parse-load-files '("clj-parse.el"
- "clj-lex.el"
- "clj-edn.el"
- "clj-ast.el"
- "tests/clj-parse-test.el"
- "tests/clj-lex-test.el"
- "tests/edn-el-test-suite.el"))
-
-(let ((pwd (replace-regexp-in-string "\n\\'" "" (shell-command-to-string
"pwd"))))
-
- (add-to-list 'load-path pwd)
-
- (dolist (file clj-parse-load-files)
- (load (concat pwd "/" file)))
-
- (if (getenv "CLJ_PARSE_LINT")
- (let ((success t))
- (dolist (file clj-parse-load-files)
- (with-temp-buffer
- (insert-file-contents file t)
- (emacs-lisp-mode)
- (let ((checking-result (package-lint-buffer)))
- (when checking-result
- (setq success nil)
- (message "In `%s':" file)
- (pcase-dolist (`(,line ,col ,type ,message) checking-result)
- (message " at %d:%d: %s: %s" line col type message))))))
- (kill-emacs (if success 0 1)))
- (ert-run-tests-batch-and-exit)))
