Skip to content
This repository has been archived by the owner on Apr 4, 2022. It is now read-only.

Commit

Permalink
Merge pull request #28 from helium/stable-deps-test-build
Browse files Browse the repository at this point in the history
stabilize deps and fix travis build
  • Loading branch information
tsantero committed Dec 2, 2015
2 parents 450073c + 4aefd18 commit d625c1c
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 28 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ language: erlang
otp_release:
- 18.1
- 17.4
- R16B03
script:
- make dialyzer
- make xref
Expand Down
4 changes: 2 additions & 2 deletions rebar.config
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
{lasp_support, ".*", {git, "git://github.com/lasp-lang/lasp_support.git", {branch, "master"}}},
{time_compat, ".*", {git, "git://github.com/lasp-lang/time_compat.git", {branch, "master"}}},
{lager, ".*", {git, "git://github.com/basho/lager.git", {tag, "2.1.1"}}},
{riak_dt, ".*", {git, "git://github.com/basho/riak_dt.git", {tag, "develop"}}},
{eleveldb, ".*", {git, "git://github.com/lasp-lang/eleveldb.git", {branch, "develop"}}}
{riak_dt, ".*", {git, "git://github.com/basho/riak_dt.git", {tag, "2.1.0"}}},
{eleveldb, ".*", {git, "git://github.com/helium/eleveldb.git", {branch, "adt-helium"}}}
]}.

{dialyzer_base_plt_apps, [kernel, stdlib, erts, sasl, eunit, syntax_tools, compiler, crypto]}.
Expand Down
38 changes: 13 additions & 25 deletions rebar.lock
Original file line number Diff line number Diff line change
@@ -1,36 +1,24 @@
[{<<"neotoma">>,
{git,"git://github.com/seancribbs/neotoma.git",
{ref,"6ac6007c7713712a80096de5c7cdf5b85b01374e"}},
2},
{<<"getopt">>,
{git,"git://github.com/jcomellas/getopt.git",
{ref,"388dc95caa7fb97ec7db8cfc39246a36aba61bd8"}},
2},
[{<<"eleveldb">>,
{git,"git://github.com/helium/eleveldb.git",
{ref,"4e199ab1518060d348ae0f9719d2cbf9f098e00d"}},
0},
{<<"goldrush">>,
{git,"git://github.com/DeadZen/goldrush.git",
{ref,"71e63212f12c25827e0c1b4198d37d5d018a7fec"}},
1},
{<<"cuttlefish">>,
{git,"git://github.com/basho/cuttlefish.git",
{ref,"68d54f6b7f0e1e1528fc6ae8555c424d12a31d68"}},
1},
{<<"time_compat">>,
{git,"git://github.com/lasp-lang/time_compat.git",
{ref,"adfae4409187cc1a9f79028986e92e8730b5eda5"}},
0},
{<<"riak_dt">>,
{git,"git://github.com/basho/riak_dt.git",
{ref,"a2986bccd1cc42facdfe739495c6d13762ae0f37"}},
{<<"lager">>,
{git,"git://github.com/basho/lager.git",
{ref,"d33ccf3b69de09a628fe38b4d7981bb8671b8a4f"}},
0},
{<<"lasp_support">>,
{git,"git://github.com/lasp-lang/lasp_support.git",
{ref,"f682f79801d3573db86bc55d849529a2a98edcfc"}},
0},
{<<"lager">>,
{git,"git://github.com/basho/lager.git",
{ref,"d33ccf3b69de09a628fe38b4d7981bb8671b8a4f"}},
{<<"riak_dt">>,
{git,"git://github.com/basho/riak_dt.git",
{ref,"f7981d4ad7407ddc085f133f204dd71bf9d50c56"}},
0},
{<<"eleveldb">>,
{git,"git://github.com/lasp-lang/eleveldb.git",
{ref,"f33872c3c377015d1b282f956e98938528c901b0"}},
{<<"time_compat">>,
{git,"git://github.com/lasp-lang/time_compat.git",
{ref,"adfae4409187cc1a9f79028986e92e8730b5eda5"}},
0}].
2 changes: 2 additions & 0 deletions test/cluster_membership_SUITE.erl
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ init_per_testcase(Case, Config) ->
Nodes = plumtree_test_utils:pmap(fun(N) ->
plumtree_test_utils:start_node(N, Config, Case)
end, [jaguar, shadow, thorn, pyros]),
{ok, _} = ct_cover:add_nodes(Nodes),
[{nodes, Nodes}|Config].

end_per_testcase(_, _Config) ->
Expand All @@ -81,6 +82,7 @@ all() ->

singleton_test(Config) ->
Nodes = proplists:get_value(nodes, Config),
ok = ct_cover:remove_nodes(Nodes),
[[Node] = plumtree_test_utils:get_cluster_members(Node) || Node <- Nodes],
ok.

Expand Down

0 comments on commit d625c1c

Please sign in to comment.