Merge branch 'fix/version-string-force-git-abbrev-size' into 'develop'

fix: version string: force git abbrev size to 8 chars

Closes #389

See merge request pleroma/pleroma!472
This commit is contained in:
kaniini 2018-11-27 17:10:08 +00:00
commit 41ff86ca1d

View file

@ -95,7 +95,7 @@ defp version(version) do
{git_tag, git_pre_release} = {git_tag, git_pre_release} =
with {tag, 0} <- System.cmd("git", ["describe", "--tags", "--abbrev=0"]), with {tag, 0} <- System.cmd("git", ["describe", "--tags", "--abbrev=0"]),
tag = String.trim(tag), tag = String.trim(tag),
{describe, 0} <- System.cmd("git", ["describe", "--tags"]), {describe, 0} <- System.cmd("git", ["describe", "--tags", "--abbrev=8"]),
describe = String.trim(describe), describe = String.trim(describe),
ahead <- String.replace(describe, tag, "") do ahead <- String.replace(describe, tag, "") do
{String.replace_prefix(tag, "v", ""), if(ahead != "", do: String.trim(ahead))} {String.replace_prefix(tag, "v", ""), if(ahead != "", do: String.trim(ahead))}