squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mix.exs: proper check on 0, remove else in git_pre_release

Browse Source
This commit is contained in:
Haelwenn (lanodan) Monnier 2020-04-24 00:26:24 +02:00
parent c63d6ba0b2
commit 053c461530
No known key found for this signature in database
GPG Key ID: D5B7A8E43C997DEE
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mix.exs
View File

@ -220,10 +220,10 @@ 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
{_gitpath, git_present} = System.cmd("sh", ["-c", "command -v git"]) {_cmdgit, cmdgit_err} = System.cmd("sh", ["-c", "command -v git"])
git_pre_release = git_pre_release =
if git_present do 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)
@ -243,15 +243,13 @@ defmodule Pleroma.Mixfile do
"0-g" <> String.trim(commit_hash) "0-g" <> String.trim(commit_hash)
true -> true ->
"" nil
end end
else
""
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 true <- git_present, with 0 <- cmdgit_err,
{branch_name, 0} <- System.cmd("git", ["rev-parse", "--abbrev-ref", "HEAD"]), {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,