From 1f50229dfffa73982244ccfb35a69a07fde10aaa Mon Sep 17 00:00:00 2001 From: Feng Lee Date: Mon, 28 Aug 2017 12:19:09 +0800 Subject: [PATCH 1/5] Call 'make deps' before 'rebar get-deps' --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 15834e620..f9502f766 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,9 @@ otp_release: - 19.1 - 19.2 +before_script: + - make deps + script: - make From b5f741391ba249bd08bfdfd077af79fc92731408 Mon Sep 17 00:00:00 2001 From: Feng Lee Date: Mon, 28 Aug 2017 15:01:50 +0800 Subject: [PATCH 2/5] Add 'make autopatch' to fix the building error of travis CI --- .travis.yml | 6 ++---- Makefile | 5 ++++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index f9502f766..cee696a6d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,10 @@ language: erlang otp_release: - - 19.0 - - 19.1 - - 19.2 + - 20.0 before_script: - - make deps + - make autopatch script: - make diff --git a/Makefile b/Makefile index 3ea8fff3d..a0e321df9 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ dep_pbkdf2 = git https://github.com/emqtt/pbkdf2 2.0.1 dep_lager_syslog = git https://github.com/basho/lager_syslog dep_bcrypt = git https://github.com/smarkets/erlang-bcrypt master dep_clique = git https://github.com/emqtt/clique -dep_jsx = git https://github.com/talentdeficit/jsx +dep_jsx = git https://github.com/talentdeficit/jsx ERLC_OPTS += +debug_info ERLC_OPTS += +'{parse_transform, lager_transform}' @@ -49,6 +49,9 @@ DIALYZER_OPTS := --verbose --statistics -Werror_handling \ include erlang.mk +autopatch:: + $(call dep_autopatch,goldrush) + app:: rebar.config app.config:: From e1816a5682eec7376e78698ac29579b1927e4b0d Mon Sep 17 00:00:00 2001 From: Feng Lee Date: Mon, 28 Aug 2017 17:31:38 +0800 Subject: [PATCH 3/5] 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}]}. From 68efc71093ac7d9de2be57433de044b7db2ca9b0 Mon Sep 17 00:00:00 2001 From: Feng Lee Date: Mon, 28 Aug 2017 17:32:04 +0800 Subject: [PATCH 4/5] Remove rebar.config to fix the building error of CI --- rebar.config | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 rebar.config diff --git a/rebar.config b/rebar.config deleted file mode 100644 index 8af38d819..000000000 --- a/rebar.config +++ /dev/null @@ -1,4 +0,0 @@ -{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","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}]}. From ceafaad6b7c0a4269359e3f8fd046784656f6da7 Mon Sep 17 00:00:00 2001 From: HuangDan Date: Wed, 6 Dec 2017 21:22:36 +0800 Subject: [PATCH 5/5] Update deps branch --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f3407dd9e..55dfd711e 100644 --- a/Makefile +++ b/Makefile @@ -8,9 +8,9 @@ dep_goldrush = git https://github.com/basho/goldrush 0.1.9 dep_gproc = git https://github.com/uwiger/gproc dep_getopt = git https://github.com/jcomellas/getopt v0.8.2 dep_lager = git https://github.com/basho/lager master -dep_esockd = git https://github.com/emqtt/esockd develop +dep_esockd = git https://github.com/emqtt/esockd v5.1 dep_ekka = git https://github.com/emqtt/ekka master -dep_mochiweb = git https://github.com/emqtt/mochiweb develop +dep_mochiweb = git https://github.com/emqtt/mochiweb v4.2.0 dep_pbkdf2 = git https://github.com/emqtt/pbkdf2 2.0.1 dep_lager_syslog = git https://github.com/basho/lager_syslog dep_bcrypt = git https://github.com/smarkets/erlang-bcrypt master