aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.travis.yml2
-rw-r--r--Makefile5
2 files changed, 6 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 9833c26..764fe9c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@ otp_release:
- R14B04
- R14B03
- R14B02
-script: "make rebuild"
+script: "make get-rebar && make rebuild"
branches:
only:
- master
diff --git a/Makefile b/Makefile
index 4d94cc7..b7ee1e5 100644
--- a/Makefile
+++ b/Makefile
@@ -31,6 +31,11 @@ endif
REBAR=$(shell which rebar)
+# If building on travis, use the rebar in the current directory
+ifeq ($(TRAVIS),true)
+REBAR=$(CURDIR)/rebar
+endif
+
ifeq ($(REBAR),)
REBAR=$(CURDIR)/rebar
endif