diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2019-06-05 12:54:30 +0700 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2019-06-05 12:54:30 +0700 |
| commit | 6ba9055b51a454baaf063943e72a39006f7e5fad (patch) | |
| tree | ca54523b21a7fe5a5ef0c99b2032fc0f899d40a8 /mix.exs | |
| parent | 9ce928d8238877f870e099cb2fe010d322717856 (diff) | |
| parent | 5188add534a1532ef323a0fec3503f8e96dfe762 (diff) | |
| download | pleroma-6ba9055b51a454baaf063943e72a39006f7e5fad.tar.gz pleroma-6ba9055b51a454baaf063943e72a39006f7e5fad.zip | |
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
Diffstat (limited to 'mix.exs')
| -rw-r--r-- | mix.exs | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -157,7 +157,8 @@ defmodule Pleroma.Mixfile do # * the mix environment if different than prod defp version(version) do {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), {describe, 0} <- System.cmd("git", ["describe", "--tags", "--abbrev=8"]), describe = String.trim(describe), |