summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaelwenn (lanodan) Monnier <contact@hacktivis.me>2020-04-19 20:23:48 +0200
committerrinpatch <rinpatch@sdf.org>2020-05-01 00:55:37 +0300
commit0d74e38f5fcf4199a314cb4dff89bb1cfbc13995 (patch)
tree738cb9bcbe35ca5f81ef9c2990252152e3eee463
parent2ff3b85326cdf42e5fc77c8b06836e0a6b97267f (diff)
mix.exs: Do not bail out when .git doesn’t exists
-rw-r--r--mix.exs31
1 files changed, 20 insertions, 11 deletions
diff --git a/mix.exs b/mix.exs
index 42bcee67d..571adc802 100644
--- a/mix.exs
+++ b/mix.exs
@@ -203,19 +203,26 @@ defmodule Pleroma.Mixfile do
identifier_filter = ~r/[^0-9a-z\-]+/i
# Pre-release version, denoted from patch version with a hyphen
+ {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 =
- with {tag, 0} <-
- System.cmd("git", ["describe", "--tags", "--abbrev=0"], stderr_to_stdout: true),
- {describe, 0} <- System.cmd("git", ["describe", "--tags", "--abbrev=8"]) do
- describe
- |> String.trim()
- |> String.replace(String.trim(tag), "")
- |> String.trim_leading("-")
- |> String.trim()
- else
- _ ->
- {commit_hash, 0} = System.cmd("git", ["rev-parse", "--short", "HEAD"])
+ cond do
+ tag_err == 0 and describe_err == 0 ->
+ describe
+ |> String.trim()
+ |> String.replace(String.trim(tag), "")
+ |> String.trim_leading("-")
+ |> String.trim()
+
+ commit_hash_err == 0 ->
"0-g" <> String.trim(commit_hash)
+
+ true ->
+ ""
end
# Branch name as pre-release version component, denoted with a dot
@@ -233,6 +240,8 @@ defmodule Pleroma.Mixfile do
|> String.replace(identifier_filter, "-")
branch_name
+ else
+ _ -> "stable"
end
build_name =