Sfoglia il codice sorgente

Merge pull request #815 from rebar/revert-811-improved-git-versioning

Revert "Improved git versioning"
pull/816/head
Tristan Sloughter 9 anni fa
parent
commit
0c3b2fd14c
1 ha cambiato i file con 2 aggiunte e 8 eliminazioni
  1. +2
    -8
      src/rebar_git_resource.erl

+ 2
- 8
src/rebar_git_resource.erl Vedi File

@ -194,16 +194,10 @@ parse_tags(Dir) ->
{error, _} ->
{undefined, "0.0.0"};
{ok, Line} ->
case re:run(Line, "(\\(|\\s)(HEAD,\\s)tag:\\s(v?([^,\\)]+))", [{capture, [3, 4], list}]) of
case re:run(Line, "(\\(|\\s)tag:\\s(v([^,\\)]+))", [{capture, [2, 3], list}]) of
{match,[Tag, Vsn]} ->
{Tag, Vsn};
nomatch ->
case rebar_utils:sh("git describe --tags",
[{use_stdout, false}, return_on_error, {cd, Dir}]) of
{error, _} ->
{undefined, "0.0.0"};
{ok, LatestVsn} ->
{undefined, string:strip(LatestVsn, both, $\n)}
end
{undefined, "0.0.0"}
end
end.

Caricamento…
Annulla
Salva