mirrors/akkoma
1
0
Fork 1
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-11-10 19:29:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'bugfix/mix.exs-version-dot-git-less' into 'develop'

Browse source 
mix.exs: version git-less (part 2, MacOS-compat)

See merge request pleroma/pleroma!2420
This commit is contained in:
lain 2020-06-20 16:22:01 +00:00
commit 6efd3730c3
1 changed files with 24 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
mix.exs
View file

@ -230,14 +230,17 @@ defmodule Pleroma.Mixfile do
defp version(version) do 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 {_cmdgit, cmdgit_err} = System.cmd("sh", ["-c", "command -v git"])
git_pre_release =
if cmdgit_err == 0 do
{tag, tag_err} = {tag, tag_err} =
System.cmd("git", ["describe", "--tags", "--abbrev=0"], stderr_to_stdout: true) System.cmd("git", ["describe", "--tags", "--abbrev=0"], stderr_to_stdout: true)
{describe, describe_err} = System.cmd("git", ["describe", "--tags", "--abbrev=8"]) {describe, describe_err} = System.cmd("git", ["describe", "--tags", "--abbrev=8"])
{commit_hash, commit_hash_err} = System.cmd("git", ["rev-parse", "--short", "HEAD"]) {commit_hash, commit_hash_err} = System.cmd("git", ["rev-parse", "--short", "HEAD"])
git_pre_release = # Pre-release version, denoted from patch version with a hyphen
cond do cond do
tag_err == 0 and describe_err == 0 -> tag_err == 0 and describe_err == 0 ->
describe describe
@ -250,12 +253,14 @@ defmodule Pleroma.Mixfile do
"0-g" <> String.trim(commit_hash) "0-g" <> String.trim(commit_hash)
true -> true ->
"" nil
end
end end
# 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 0 <- cmdgit_err,
{branch_name, 0} <- System.cmd("git", ["rev-parse", "--abbrev-ref", "HEAD"]),
branch_name <- String.trim(branch_name), 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 <- true <-
@ -269,7 +274,7 @@ defmodule Pleroma.Mixfile do
branch_name branch_name
else else
_ -> "stable" _ -> ""
end end
build_name = build_name =