From 6c15a9e48149aff384b04527535fbc4dadd44d09 Mon Sep 17 00:00:00 2001 From: nuex Date: Thu, 6 Mar 2014 14:20:48 -0500 Subject: update travis build command --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3 From 96949363d301df5b120c717b539e73b7020edc68 Mon Sep 17 00:00:00 2001 From: nuex Date: Thu, 6 Mar 2014 14:21:39 -0500 Subject: unset REBAR target when building on travis; ensure latest rebar --- Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Makefile b/Makefile index 4d94cc7..28a35d5 100644 --- a/Makefile +++ b/Makefile @@ -35,6 +35,11 @@ ifeq ($(REBAR),) REBAR=$(CURDIR)/rebar endif +# Unset rebar when building on Travis +ifeq ($(TRAVIS),true) +REBAR="" +endif + # ============================================================================= # Handle version discovery # ============================================================================= -- cgit v1.2.3 From 1c5bcba490b1af53e28f0a831a273fece5f770a5 Mon Sep 17 00:00:00 2001 From: nuex Date: Fri, 7 Mar 2014 04:43:53 -0500 Subject: setting REBAR to the rebar in the current directory works --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 28a35d5..b7ee1e5 100644 --- a/Makefile +++ b/Makefile @@ -31,13 +31,13 @@ endif REBAR=$(shell which rebar) -ifeq ($(REBAR),) +# If building on travis, use the rebar in the current directory +ifeq ($(TRAVIS),true) REBAR=$(CURDIR)/rebar endif -# Unset rebar when building on Travis -ifeq ($(TRAVIS),true) -REBAR="" +ifeq ($(REBAR),) +REBAR=$(CURDIR)/rebar endif # ============================================================================= -- cgit v1.2.3