diff options
| author | Tristan Sloughter <[email protected]> | 2015-07-10 12:31:17 -0500 |
|---|---|---|
| committer | Tristan Sloughter <[email protected]> | 2015-07-10 12:31:17 -0500 |
| commit | 9fa2221c27a9671c4c223758a2c48743176ffd70 (patch) | |
| tree | 76987099c4c280a80ea9ea9f6fdbdff9f53dc73f | |
| parent | f9eac2d57e934da6c1765d47a66dd69fbfaca753 (diff) | |
| parent | 1c9c4d1d772fcbf4fdad09eea08f0a7e01c0c0f4 (diff) | |
| download | relx-9fa2221c27a9671c4c223758a2c48743176ffd70.tar.gz relx-9fa2221c27a9671c4c223758a2c48743176ffd70.tar.bz2 relx-9fa2221c27a9671c4c223758a2c48743176ffd70.zip | |
Merge pull request #363 from joedevivo/master
Now you can specify {semver, "version"}
| -rw-r--r-- | rebar.config | 2 | ||||
| -rw-r--r-- | rebar.lock | 2 | ||||
| -rw-r--r-- | src/rlx_config.erl | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/rebar.config b/rebar.config index 203a937..5a93b17 100644 --- a/rebar.config +++ b/rebar.config @@ -1,6 +1,6 @@ %% -*- mode: Erlang; fill-column: 80; comment-column: 75; -*- %% Dependencies ================================================================ -{deps, [{erlware_commons, "0.13.0"}, +{deps, [{erlware_commons, "0.14.0"}, {providers, "1.4.1"}, {getopt, "0.8.2"}, {bbmustache, "1.0.3"} @@ -1,4 +1,4 @@ [{<<"bbmustache">>,{pkg,<<"bbmustache">>,<<"1.0.3">>},0}, {<<"providers">>,{pkg,<<"providers">>,<<"1.4.1">>},0}, - {<<"erlware_commons">>,{pkg,<<"erlware_commons">>,<<"0.13.0">>},0}, + {<<"erlware_commons">>,{pkg,<<"erlware_commons">>,<<"0.14.0">>},0}, {<<"getopt">>,{pkg,<<"getopt">>,<<"0.8.2">>},0}]. diff --git a/src/rlx_config.erl b/src/rlx_config.erl index 33e8f27..1f441ed 100644 --- a/src/rlx_config.erl +++ b/src/rlx_config.erl @@ -295,7 +295,9 @@ merge_configs([{Key, Value} | CliTerms], ConfigTerms) -> end. parse_vsn(Vsn) when Vsn =:= semver ; Vsn =:= "semver" -> - {ok, V} = ec_git_vsn:vsn([]), + parse_vsn({semver, "v"}); +parse_vsn({semver, Prefix}) -> + {ok, V} = ec_git_vsn:vsn({Prefix}), V; parse_vsn(Vsn) -> Vsn. |