sergiotarxz/Pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'remove-useless-warning' into 'develop'

Browse Source 
Remove version mismatch warning

See merge request pleroma/pleroma!2001
This commit is contained in:
lain 2019-11-21 12:22:46 +00:00
commit cd8da73bbe
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mix.exs
View File

@ -194,25 +194,19 @@ defp version(version) do
identifier_filter = ~r/[^0-9a-z\-]+/i identifier_filter = ~r/[^0-9a-z\-]+/i
# Pre-release version, denoted from patch version with a hyphen # Pre-release version, denoted from patch version with a hyphen
{git_tag, git_pre_release} = git_pre_release =
with {tag, 0} <- with {tag, 0} <-
System.cmd("git", ["describe", "--tags", "--abbrev=0"], stderr_to_stdout: true), System.cmd("git", ["describe", "--tags", "--abbrev=0"], stderr_to_stdout: true),
tag = String.trim(tag), {describe, 0} <- System.cmd("git", ["describe", "--tags", "--abbrev=8"]) do
{describe, 0} <- System.cmd("git", ["describe", "--tags", "--abbrev=8"]), describe
describe = String.trim(describe), |> String.trim()
ahead <- String.replace(describe, tag, ""), |> String.replace(String.trim(tag), "")
ahead <- String.trim_leading(ahead, "-") do |> String.trim_leading("-")
{String.replace_prefix(tag, "v", ""), if(ahead != "", do: String.trim(ahead))} |> String.trim()
else else
_ -> _ ->
{commit_hash, 0} = System.cmd("git", ["rev-parse", "--short", "HEAD"]) {commit_hash, 0} = System.cmd("git", ["rev-parse", "--short", "HEAD"])
{nil, "0-g" <> String.trim(commit_hash)} "0-g" <> String.trim(commit_hash)
end
if git_tag && version != git_tag do
Mix.shell().error(
"Application version #{inspect(version)} does not match git tag #{inspect(git_tag)}"
)
end end
# Branch name as pre-release version component, denoted with a dot # Branch name as pre-release version component, denoted with a dot