Merge branch 'bugfix/mix-dotgit' into 'develop'
mix: Check `.git` presence See merge request pleroma/pleroma!3638
This commit is contained in:
commit
2db640632b
1 changed files with 3 additions and 1 deletions
4
mix.exs
4
mix.exs
|
@ -243,9 +243,10 @@ defmodule Pleroma.Mixfile do
|
|||
identifier_filter = ~r/[^0-9a-z\-]+/i
|
||||
|
||||
git_available? = match?({_output, 0}, System.cmd("sh", ["-c", "command -v git"]))
|
||||
dotgit_present? = File.exists?(".git")
|
||||
|
||||
git_pre_release =
|
||||
if git_available? do
|
||||
if git_available? and dotgit_present? do
|
||||
{tag, tag_err} =
|
||||
System.cmd("git", ["describe", "--tags", "--abbrev=0"], stderr_to_stdout: true)
|
||||
|
||||
|
@ -272,6 +273,7 @@ defmodule Pleroma.Mixfile do
|
|||
# Branch name as pre-release version component, denoted with a dot
|
||||
branch_name =
|
||||
with true <- git_available?,
|
||||
true <- dotgit_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,
|
||||
|
|
Loading…
Reference in a new issue