diff options
| author | Dave Smith <dizzyd@dizzyd.com> | 2013-04-23 05:53:00 -0700 |
|---|---|---|
| committer | Dave Smith <dizzyd@dizzyd.com> | 2013-04-23 05:53:00 -0700 |
| commit | 65b183b020bdd452ea645aa339f63c93ec22d5b5 (patch) | |
| tree | 4e048f9cc6bb8699c13843116bdb1f23c8deabd2 | |
| parent | a3ce71e3812670cb7332764f743ca20e0bd2b57f (diff) | |
| parent | cbc832fe87aa2835c7b55fa3d446cf71944e440e (diff) | |
Merge pull request #83 from rebar/travisci-fixes
Travisci fixes
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | inttest/tdeps2/tdeps2_rt.erl | 19 |
2 files changed, 16 insertions, 4 deletions
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 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. |