limepotato/akkoma
1
0
Fork 0
Code Pull requests Activity

mix.exs: Fix for MacOS

Browse source
This commit is contained in:
Haelwenn (lanodan) Monnier 2020-04-23 23:44:03 +02:00
parent c906ffc51a
commit b429a49504
No known key found for this signature in database
GPG key ID: D5B7A8E43C997DEE
1 changed files with 25 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
mix.exs
View file

@ -220,14 +220,17 @@ defmodule Pleroma.Mixfile do
defp version(version) do
identifier_filter = ~r/[^0-9a-z\-]+/i
# Pre-release version, denoted from patch version with a hyphen
{_gitpath, git_present} = System.cmd("sh", ["-c", "command -v git"])
git_pre_release =
if git_present do
{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 =
# Pre-release version, denoted from patch version with a hyphen
cond do
tag_err == 0 and describe_err == 0 ->
describe
@ -242,10 +245,14 @@ defmodule Pleroma.Mixfile do
true ->
""
end
else
""
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"]),
with true <- git_present,
{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,
true <-