mirror of
https://akkoma.dev/AkkomaGang/akkoma.git
synced 2024-11-10 19:29:11 +00:00
[#1048] Resolved violations of SemVer version format. Refactoring.
This commit is contained in:
parent
a565dbde4f
commit
a02f52d12a
1 changed files with 27 additions and 21 deletions
48
mix.exs
48
mix.exs
|
@ -174,10 +174,14 @@ defmodule Pleroma.Mixfile do
|
||||||
# Builds a version string made of:
|
# Builds a version string made of:
|
||||||
# * the application version
|
# * the application version
|
||||||
# * a pre-release if ahead of the tag: the describe string (-count-commithash)
|
# * a pre-release if ahead of the tag: the describe string (-count-commithash)
|
||||||
# * build info:
|
# * branch name
|
||||||
|
# * build metadata:
|
||||||
# * a build name if `PLEROMA_BUILD_NAME` or `:pleroma, :build_name` is defined
|
# * a build name if `PLEROMA_BUILD_NAME` or `:pleroma, :build_name` is defined
|
||||||
# * the mix environment if different than prod
|
# * the mix environment if different than prod
|
||||||
defp version(version) do
|
defp version(version) do
|
||||||
|
identifier_filter = ~r/[^0-9a-z\-]+/i
|
||||||
|
|
||||||
|
# Pre-release version, denoted from patch version with a hyphen
|
||||||
{git_tag, git_pre_release} =
|
{git_tag, 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),
|
||||||
|
@ -198,6 +202,19 @@ defmodule Pleroma.Mixfile do
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# Branch name as pre-release version component, denoted with a dot
|
||||||
|
branch_name =
|
||||||
|
with {branch_name, 0} <- System.cmd("git", ["rev-parse", "--abbrev-ref", "HEAD"]),
|
||||||
|
branch_name <- System.get_env("PLEROMA_BUILD_BRANCH") || branch_name,
|
||||||
|
true <- branch_name != "master" do
|
||||||
|
branch_name =
|
||||||
|
branch_name
|
||||||
|
|> String.trim()
|
||||||
|
|> String.replace(identifier_filter, "-")
|
||||||
|
|
||||||
|
"." <> branch_name
|
||||||
|
end
|
||||||
|
|
||||||
build_name =
|
build_name =
|
||||||
cond do
|
cond do
|
||||||
name = Application.get_env(:pleroma, :build_name) -> name
|
name = Application.get_env(:pleroma, :build_name) -> name
|
||||||
|
@ -206,37 +223,26 @@ defmodule Pleroma.Mixfile do
|
||||||
end
|
end
|
||||||
|
|
||||||
env_name = if Mix.env() != :prod, do: to_string(Mix.env())
|
env_name = if Mix.env() != :prod, do: to_string(Mix.env())
|
||||||
|
|
||||||
env_override = System.get_env("PLEROMA_BUILD_ENV")
|
env_override = System.get_env("PLEROMA_BUILD_ENV")
|
||||||
|
|
||||||
env_name =
|
env_name =
|
||||||
if env_override do
|
case env_override do
|
||||||
if env_override != "prod", do: env_override
|
nil -> env_name
|
||||||
else
|
env_override when env_override in ["", "prod"] -> nil
|
||||||
env_name
|
env_override -> env_override
|
||||||
end
|
end
|
||||||
|
|
||||||
build =
|
# Build metadata, denoted with a plus sign
|
||||||
|
build_metadata =
|
||||||
[build_name, env_name]
|
[build_name, env_name]
|
||||||
|> Enum.filter(fn string -> string && string != "" end)
|
|> Enum.filter(fn string -> string && string != "" end)
|
||||||
|> Enum.join("-")
|
|> Enum.join(".")
|
||||||
|> (fn
|
|> (fn
|
||||||
"" -> nil
|
"" -> nil
|
||||||
string -> "+" <> string
|
string -> "+" <> String.replace(string, identifier_filter, "-")
|
||||||
end).()
|
end).()
|
||||||
|
|
||||||
branch_name =
|
[version, git_pre_release, branch_name, build_metadata]
|
||||||
with {branch_name, 0} <- System.cmd("git", ["rev-parse", "--abbrev-ref", "HEAD"]),
|
|
||||||
branch_name <- System.get_env("PLEROMA_BUILD_BRANCH") || branch_name,
|
|
||||||
true <- branch_name != "master" do
|
|
||||||
branch_name =
|
|
||||||
String.trim(branch_name)
|
|
||||||
|> String.replace(~r/[^0-9a-z\-\.]+/i, "-")
|
|
||||||
|
|
||||||
"-" <> branch_name
|
|
||||||
end
|
|
||||||
|
|
||||||
[version, git_pre_release, branch_name, build]
|
|
||||||
|> Enum.filter(fn string -> string && string != "" end)
|
|> Enum.filter(fn string -> string && string != "" end)
|
||||||
|> Enum.join()
|
|> Enum.join()
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue