branch: externals/graphql
commit 093c76198139ed6d9243a321f8dfb612f59eca4a
Author: Sean Allred <c...@seanallred.com>
Commit: Sean Allred <c...@seanallred.com>
Switch to the real Emake
---
.travis.yml | 27 ++++++++++++++++-----------
Makefile | 26 ++++----------------------
2 files changed, 20 insertions(+), 33 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 217055bce8..e9e636618e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,22 +1,27 @@
-language: emacs-lisp
+language: generic
sudo: required
dist: trusty
cache:
-- directories:
- - "$HOME/emacs"
+ - directories:
+ - "$HOME/emacs"
matrix:
fast_finish: true
allow_failures:
- - env: EMACS_VERSION=snapshot
+ - env: EMACS_VERSION=snapshot
env:
+ global:
+ - EMAKE_SHA1=4208a5e4e68c0e13ecd57195209bdeaf5959395f
matrix:
- - EMACS_VERSION=25.1
- - EMACS_VERSION=25.2
- - EMACS_VERSION=25.3
- - EMACS_VERSION=snapshot
+ - EMACS_VERSION=25.1
+ - EMACS_VERSION=25.2
+ - EMACS_VERSION=25.3
+ - EMACS_VERSION=snapshot
before_install:
-- make CI-setup
+ - wget
"https://raw.githubusercontent.com/vermiculus/emake.el/${EMAKE_SHA1}/emake.mk";
+ - make setup
install:
-- make install
+ - make .elpa
script:
-- make test
+ - make test-ert
+ - make compile
+ - make test-ert
diff --git a/Makefile b/Makefile
index e8bb6507a1..c80cf398b0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,24 +1,6 @@
-EENVS := PACKAGE_FILE="graphql.el" PACKAGE_DEV_DEPS="" PACKAGE_SOURCES="gnu"
-EMAKE := $(EENVS) emacs -batch -l test/make.el --eval "(make (pop argv))"
+# EMACS_VERSION should be set in your ~/.profile on your development machine
+PACKAGE_BASENAME := graphql
-.PHONY: clean install compile test CI-setup
+.DEFAULT_GOAL: help
-clean:
- rm -f *.elc
- rm -rf .elpa/
-
-install: .elpa/
-.elpa/:
- $(EMAKE) update
-
-compile: clean
- $(EMAKE) compile
-
-test:
- $(EMAKE) test
-
-CI-setup:
- export PATH="$(HOME)/bin:$(PATH)"
- wget
'https://raw.githubusercontent.com/flycheck/emacs-travis/master/emacs-travis.mk'
- make -f emacs-travis.mk install_emacs
- emacs --version
+include emake.mk
