Merge branch 'bugfix/mix.exs-version-dot-git-less' into 'develop'
mix.exs: Do not bail out when .git doesn’t exists See merge request pleroma/pleroma!2405
This commit is contained in:
commit
389fb36fb5
21
mix.exs
21
mix.exs
@ -221,19 +221,26 @@ defmodule Pleroma.Mixfile do
|
||||
identifier_filter = ~r/[^0-9a-z\-]+/i
|
||||
|
||||
# Pre-release version, denoted from patch version with a hyphen
|
||||
{tag, tag_err} =
|
||||
System.cmd("git", ["describe", "--tags", "--abbrev=0"], stderr_to_stdout: true)
|
||||
|
||||
{describe, describe_err} = System.cmd("git", ["describe", "--tags", "--abbrev=8"])
|
||||
{commit_hash, commit_hash_err} = System.cmd("git", ["rev-parse", "--short", "HEAD"])
|
||||
|
||||
git_pre_release =
|
||||
with {tag, 0} <-
|
||||
System.cmd("git", ["describe", "--tags", "--abbrev=0"], stderr_to_stdout: true),
|
||||
{describe, 0} <- System.cmd("git", ["describe", "--tags", "--abbrev=8"]) do
|
||||
cond do
|
||||
tag_err == 0 and describe_err == 0 ->
|
||||
describe
|
||||
|> String.trim()
|
||||
|> String.replace(String.trim(tag), "")
|
||||
|> String.trim_leading("-")
|
||||
|> String.trim()
|
||||
else
|
||||
_ ->
|
||||
{commit_hash, 0} = System.cmd("git", ["rev-parse", "--short", "HEAD"])
|
||||
|
||||
commit_hash_err == 0 ->
|
||||
"0-g" <> String.trim(commit_hash)
|
||||
|
||||
true ->
|
||||
""
|
||||
end
|
||||
|
||||
# Branch name as pre-release version component, denoted with a dot
|
||||
@ -251,6 +258,8 @@ defmodule Pleroma.Mixfile do
|
||||
|> String.replace(identifier_filter, "-")
|
||||
|
||||
branch_name
|
||||
else
|
||||
_ -> "stable"
|
||||
end
|
||||
|
||||
build_name =
|
||||
|
Loading…
Reference in New Issue
Block a user