|
|
@ -190,12 +190,13 @@ defmodule Pleroma.Mixfile do
|
|
|
|
tag = String.trim(tag),
|
|
|
|
tag = String.trim(tag),
|
|
|
|
{describe, 0} <- System.cmd("git", ["describe", "--tags", "--abbrev=8"]),
|
|
|
|
{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, ""),
|
|
|
|
|
|
|
|
ahead <- String.trim_leading(ahead, "-") do
|
|
|
|
{String.replace_prefix(tag, "v", ""), if(ahead != "", do: String.trim(ahead))}
|
|
|
|
{String.replace_prefix(tag, "v", ""), if(ahead != "", do: String.trim(ahead))}
|
|
|
|
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)}
|
|
|
|
{nil, "0-g" <> String.trim(commit_hash)}
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
if git_tag && version != git_tag do
|
|
|
|
if git_tag && version != git_tag do
|
|
|
@ -207,14 +208,15 @@ defmodule Pleroma.Mixfile do
|
|
|
|
# Branch name as pre-release version component, denoted with a dot
|
|
|
|
# Branch name as pre-release version component, denoted with a dot
|
|
|
|
branch_name =
|
|
|
|
branch_name =
|
|
|
|
with {branch_name, 0} <- System.cmd("git", ["rev-parse", "--abbrev-ref", "HEAD"]),
|
|
|
|
with {branch_name, 0} <- System.cmd("git", ["rev-parse", "--abbrev-ref", "HEAD"]),
|
|
|
|
|
|
|
|
branch_name <- String.trim(branch_name),
|
|
|
|
branch_name <- System.get_env("PLEROMA_BUILD_BRANCH") || branch_name,
|
|
|
|
branch_name <- System.get_env("PLEROMA_BUILD_BRANCH") || branch_name,
|
|
|
|
true <- branch_name != "master" do
|
|
|
|
true <- branch_name not in ["master", "HEAD"] do
|
|
|
|
branch_name =
|
|
|
|
branch_name =
|
|
|
|
branch_name
|
|
|
|
branch_name
|
|
|
|
|> String.trim()
|
|
|
|
|> String.trim()
|
|
|
|
|> String.replace(identifier_filter, "-")
|
|
|
|
|> String.replace(identifier_filter, "-")
|
|
|
|
|
|
|
|
|
|
|
|
"." <> branch_name
|
|
|
|
branch_name
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
build_name =
|
|
|
|
build_name =
|
|
|
@ -234,6 +236,17 @@ defmodule Pleroma.Mixfile do
|
|
|
|
env_override -> env_override
|
|
|
|
env_override -> env_override
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Pre-release version, denoted by appending a hyphen
|
|
|
|
|
|
|
|
# and a series of dot separated identifiers
|
|
|
|
|
|
|
|
pre_release =
|
|
|
|
|
|
|
|
[git_pre_release, branch_name]
|
|
|
|
|
|
|
|
|> Enum.filter(fn string -> string && string != "" end)
|
|
|
|
|
|
|
|
|> Enum.join(".")
|
|
|
|
|
|
|
|
|> (fn
|
|
|
|
|
|
|
|
"" -> nil
|
|
|
|
|
|
|
|
string -> "-" <> String.replace(string, identifier_filter, "-")
|
|
|
|
|
|
|
|
end).()
|
|
|
|
|
|
|
|
|
|
|
|
# Build metadata, denoted with a plus sign
|
|
|
|
# Build metadata, denoted with a plus sign
|
|
|
|
build_metadata =
|
|
|
|
build_metadata =
|
|
|
|
[build_name, env_name]
|
|
|
|
[build_name, env_name]
|
|
|
@ -244,7 +257,7 @@ defmodule Pleroma.Mixfile do
|
|
|
|
string -> "+" <> String.replace(string, identifier_filter, "-")
|
|
|
|
string -> "+" <> String.replace(string, identifier_filter, "-")
|
|
|
|
end).()
|
|
|
|
end).()
|
|
|
|
|
|
|
|
|
|
|
|
[version, git_pre_release, branch_name, build_metadata]
|
|
|
|
[version, pre_release, build_metadata]
|
|
|
|
|> Enum.filter(fn string -> string && string != "" end)
|
|
|
|
|> Enum.filter(fn string -> string && string != "" end)
|
|
|
|
|> Enum.join()
|
|
|
|
|> Enum.join()
|
|
|
|
end
|
|
|
|
end
|
|
|
|