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

Merge branch 'remove-tag-warning' into 'develop'

Browse Source 
Mix: Swallow git error messages during version number handling.

See merge request pleroma/pleroma!1247
This commit is contained in:
Haelwenn 2019-06-04 15:46:38 +00:00
commit 5188add534
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mix.exs
View File

@ -157,7 +157,8 @@ defmodule Pleroma.Mixfile do
# * the mix environment if different than prod # * the mix environment if different than prod
defp version(version) do defp version(version) do
{git_tag, git_pre_release} = {git_tag, git_pre_release} =
with {tag, 0} <- System.cmd("git", ["describe", "--tags", "--abbrev=0"]), with {tag, 0} <-
System.cmd("git", ["describe", "--tags", "--abbrev=0"], stderr_to_stdout: true),
tag = String.trim(tag), tag = String.trim(tag),
{describe, 0} <- System.cmd("git", ["describe", "--tags", "--abbrev=8"]), {describe, 0} <- System.cmd("git", ["describe", "--tags", "--abbrev=8"]),
describe = String.trim(describe), describe = String.trim(describe),