yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix travis build

This commit is contained in:
spring2maz 2018-09-13 18:23:19 +02:00 committed by Feng Lee
parent fde6a2a4c3
commit 35d209f364
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -8,8 +8,10 @@ before_install:
script: script:
- make dep-vsn-check - make dep-vsn-check
- make rebar-compile
- make rebar-eunit - make rebar-eunit
- make rebar-ct - make rebar-ct
- make rebar-cover
- make coveralls - make coveralls
sudo: false sudo: false

11
Makefile
View File

@ -18,7 +18,7 @@ dep_lager_syslog = git https://github.com/basho/lager_syslog 3.0.1
NO_AUTOPATCH = cuttlefish NO_AUTOPATCH = cuttlefish
ERLC_OPTS += +debug_info ERLC_OPTS += +debug_info -DAPPLICATION=emqx
ERLC_OPTS += +'{parse_transform, lager_transform}' ERLC_OPTS += +'{parse_transform, lager_transform}'
BUILD_DEPS = cuttlefish BUILD_DEPS = cuttlefish
@ -27,7 +27,7 @@ dep_cuttlefish = git https://github.com/emqx/cuttlefish emqx30
#TEST_DEPS = emqx_ct_helplers #TEST_DEPS = emqx_ct_helplers
#dep_emqx_ct_helplers = git git@github.com:emqx/emqx-ct-helpers #dep_emqx_ct_helplers = git git@github.com:emqx/emqx-ct-helpers
TEST_ERLC_OPTS += +debug_info TEST_ERLC_OPTS += +debug_info -DAPPLICATION=emqx
TEST_ERLC_OPTS += +'{parse_transform, lager_transform}' TEST_ERLC_OPTS += +'{parse_transform, lager_transform}'
EUNIT_OPTS = verbose EUNIT_OPTS = verbose
@ -60,7 +60,7 @@ gen-clean:
@rm -f etc/gen.emqx.conf @rm -f etc/gen.emqx.conf
bbmustache: bbmustache:
$(verbose) git clone https://github.com/soranoba/bbmustache.git && pushd bbmustache && ./rebar3 compile && popd $(verbose) git clone https://github.com/soranoba/bbmustache.git && cd bbmustache && ./rebar3 compile && cd ..
# This hack is to generate a conf file for testing # This hack is to generate a conf file for testing
# relx overlay is used for release # relx overlay is used for release
@ -78,6 +78,9 @@ app.config: etc/gen.emqx.conf
ct: cuttlefish app.config ct: cuttlefish app.config
rebar-cover:
@rebar3 cover
coveralls: coveralls:
@rebar3 coveralls send @rebar3 coveralls send
@ -91,7 +94,7 @@ rebar-cuttlefish: rebar-deps
rebar-deps: rebar-deps:
@rebar3 get-deps @rebar3 get-deps
rebar-eunit: rebar-eunit: rebar-cuttlefish
@rebar3 eunit @rebar3 eunit
rebar-compile: rebar-compile:

10
rebar.config
View File

@ -20,7 +20,8 @@
warn_unused_import, warn_unused_import,
warn_obsolete_guard, warn_obsolete_guard,
debug_info, debug_info,
{parse_transform, lager_transform}]}. {parse_transform, lager_transform},
{d, 'APPLICATION', emqx}]}.
{xref_checks, [undefined_function_calls, undefined_functions, {xref_checks, [undefined_function_calls, undefined_functions,
locals_not_used, deprecated_function_calls, locals_not_used, deprecated_function_calls,
warnings_as_errors, deprecated_functions]}. warnings_as_errors, deprecated_functions]}.
@ -29,10 +30,5 @@
{cover_export_enabled, true}. {cover_export_enabled, true}.
%% rebar3_neotoma_plugin is needed to compile the .peg file for cuttlefish %% rebar3_neotoma_plugin is needed to compile the .peg file for cuttlefish
{plugins, [rebar3_neotoma_plugin]}. {plugins, [coveralls, rebar3_neotoma_plugin]}.
%% Do not include cuttlefish's dependencies as mine
%% its dependencies are only fetched to compile itself
%% they are however not needed by emqx
{overrides, [{override, cuttlefish, [{deps, []}]}
]}.

1
rebar.config.script
View File

@ -3,7 +3,6 @@ CONFIG1 = case os:getenv("TRAVIS") of
"true" -> "true" ->
JobId = os:getenv("TRAVIS_JOB_ID"), JobId = os:getenv("TRAVIS_JOB_ID"),
[{coveralls_service_job_id, JobId}, [{coveralls_service_job_id, JobId},
{plugins, [coveralls]},
{coveralls_coverdata, "_build/test/cover/*.coverdata"}, {coveralls_coverdata, "_build/test/cover/*.coverdata"},
{coveralls_service_name , "travis-ci"} | CONFIG]; {coveralls_service_name , "travis-ci"} | CONFIG];
_ -> _ ->