diff options
| author | Jordan Wilberding <[email protected]> | 2014-03-07 15:47:57 +0100 |
|---|---|---|
| committer | Jordan Wilberding <[email protected]> | 2014-03-07 15:47:57 +0100 |
| commit | 7b813dbc775d84a29ee08d717f084df856492251 (patch) | |
| tree | 2ea2885eac4d470c9d78198175a0212cc9c634ff | |
| parent | 574047d56f2be6c38952652c1681ee33b8a33ee9 (diff) | |
| parent | 1c5bcba490b1af53e28f0a831a273fece5f770a5 (diff) | |
| download | relx-7b813dbc775d84a29ee08d717f084df856492251.tar.gz relx-7b813dbc775d84a29ee08d717f084df856492251.tar.bz2 relx-7b813dbc775d84a29ee08d717f084df856492251.zip | |
Merge pull request #134 from nuex/travis_rebar
Ensure latest rebar is fetched when building on Travis-CI
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | Makefile | 5 |
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 @@ -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 |