From e1816a5682eec7376e78698ac29579b1927e4b0d Mon Sep 17 00:00:00 2001 From: Feng Lee Date: Mon, 28 Aug 2017 17:31:38 +0800 Subject: [PATCH] Remove rebar.config to fix the building error of CI --- .gitignore | 1 + .travis.yml | 5 +---- Makefile | 3 --- rebar.config | 2 +- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 0aa159fd7..f8f1af339 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ _build .rebar3 rebar3.crashdump .DS_Store +rebar.config diff --git a/.travis.yml b/.travis.yml index cee696a6d..8d4f7acc4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,10 +3,7 @@ language: erlang otp_release: - 20.0 -before_script: - - make autopatch - -script: +script: - make sudo: false diff --git a/Makefile b/Makefile index a0e321df9..2826d547d 100644 --- a/Makefile +++ b/Makefile @@ -49,9 +49,6 @@ DIALYZER_OPTS := --verbose --statistics -Werror_handling \ include erlang.mk -autopatch:: - $(call dep_autopatch,goldrush) - app:: rebar.config app.config:: diff --git a/rebar.config b/rebar.config index 834382f05..8af38d819 100644 --- a/rebar.config +++ b/rebar.config @@ -1,4 +1,4 @@ {deps, [ -{goldrush,".*",{git,"https://github.com/basho/goldrush","0.1.9"}},{gproc,".*",{git,"https://github.com/uwiger/gproc",""}},{lager,".*",{git,"https://github.com/basho/lager","master"}},{esockd,".*",{git,"https://github.com/emqtt/esockd","master"}},{ekka,".*",{git,"https://github.com/emqtt/ekka","develop"}},{mochiweb,".*",{git,"https://github.com/emqtt/mochiweb","master"}},{pbkdf2,".*",{git,"https://github.com/emqtt/pbkdf2","2.0.1"}},{lager_syslog,".*",{git,"https://github.com/basho/lager_syslog",""}},{bcrypt,".*",{git,"https://github.com/smarkets/erlang-bcrypt","master"}} +{goldrush,".*",{git,"https://github.com/basho/goldrush","0.1.9"}},{gproc,".*",{git,"https://github.com/uwiger/gproc",""}},{lager,".*",{git,"https://github.com/basho/lager","master"}},{esockd,".*",{git,"https://github.com/emqtt/esockd","master"}},{ekka,".*",{git,"https://github.com/emqtt/ekka","master"}},{mochiweb,".*",{git,"https://github.com/emqtt/mochiweb","master"}},{pbkdf2,".*",{git,"https://github.com/emqtt/pbkdf2","2.0.1"}},{lager_syslog,".*",{git,"https://github.com/basho/lager_syslog",""}},{bcrypt,".*",{git,"https://github.com/smarkets/erlang-bcrypt","master"}},{clique,".*",{git,"https://github.com/emqtt/clique",""}},{jsx,".*",{git,"https://github.com/talentdeficit/jsx",""}} ]}. {erl_opts, [debug_info,{parse_transform,lager_transform}]}.