From 9ad0a4a185523b6b4c0ea6804889d965db1a38cb Mon Sep 17 00:00:00 2001 From: Dave Smith Date: Tue, 23 Apr 2013 06:42:16 -0600 Subject: Additional travisci fixes --- inttest/tdeps2/tdeps2_rt.erl | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/inttest/tdeps2/tdeps2_rt.erl b/inttest/tdeps2/tdeps2_rt.erl index dca5f03..987567e 100644 --- a/inttest/tdeps2/tdeps2_rt.erl +++ b/inttest/tdeps2/tdeps2_rt.erl @@ -31,12 +31,23 @@ files() -> {copy, "c.hrl", "repo/c/include/c.hrl"} ]. +apply_cmds([], _Params) -> + ok; +apply_cmds([Cmd | Rest], Params) -> + io:format("Running: ~s (~p)\n", [Cmd, Params]), + {ok, _} = retest_sh:run(Cmd, Params), + apply_cmds(Rest, Params). + run(_Dir) -> - %% Initialize the b/c apps as mercurial repos so that dependencies pull + %% Initialize the b/c apps as git repos so that dependencies pull %% properly - GitCmd = "/bin/sh -c \"git init && git add -A && git commit -a -m 'Initial commit'\"", - {ok, _} = retest_sh:run(GitCmd, [{dir, "repo/b"}]), - {ok, _} = retest_sh:run(GitCmd, [{dir, "repo/c"}]), + GitCmds = ["git init", + "git add -A", + "git config user.email 'tdeps@example.com'", + "git config user.name 'tdeps'", + "git commit -a -m 'Initial Commit'"], + ok = apply_cmds(GitCmds, [{dir, "repo/b"}]), + ok = apply_cmds(GitCmds, [{dir, "repo/c"}]), {ok, _} = retest_sh:run("./rebar -v get-deps compile", []), ok. -- cgit v1.1 From cbc832fe87aa2835c7b55fa3d446cf71944e440e Mon Sep 17 00:00:00 2001 From: Dave Smith Date: Tue, 23 Apr 2013 06:44:43 -0600 Subject: Adding R16B to travis build --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index c01e70c..191d337 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ language: erlang otp_release: + - R16B - R15B01 - R15B - R14B04 -- cgit v1.1