branch: externals/graphql
commit d2bb248d2cb45cadf51fa5e5c2de208fc9c3c4bc
Author: Sean Allred <c...@seanallred.com>
Commit: Sean Allred <c...@seanallred.com>
Use new version of Emake
---
.gitignore | 7 +++----
.travis.yml | 4 ++--
Makefile | 3 +++
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/.gitignore b/.gitignore
index 3216be668f..7e111dd57b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-.cask/
-.elpa/
-/emake.*
-/.elpa*
+*.elc
+/.emake/
+/emake.mk
diff --git a/.travis.yml b/.travis.yml
index 281b5c3c14..3a0dc4d867 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ matrix:
- env: EMACS_VERSION=snapshot
env:
global:
- - EMAKE_SHA1=4208a5e4e68c0e13ecd57195209bdeaf5959395f
+ - EMAKE_SHA1=1b23379eb5a9f82d3e2d227d0f217864e40f23e0
matrix:
- EMACS_VERSION=25.1
- EMACS_VERSION=25.2
@@ -21,7 +21,7 @@ before_install:
- wget
"https://raw.githubusercontent.com/vermiculus/emake.el/${EMAKE_SHA1}/emake.mk";
- make setup
install:
- - make .elpa
+ - make install
script:
- make test-ert
- make compile
diff --git a/Makefile b/Makefile
index 7cbafb6986..e1a414b4ac 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,9 @@ PACKAGE_BASENAME := graphql
emake.mk: export EMAKE_SHA1 := $(EMAKE_SHA1)
emake.mk: ## download the emake Makefile
+# we use yq to retrieve the before_install command.
+# upon expansion, that command will be run with this target.
+ rm -f emake.mk
$(shell yq r .travis.yml 'before_install[0]')
include emake.mk
