logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: cd8da73bbeec3809fe825dca2346db3ca8b70a67
parent: 937d6c6b32fc735cb5a56d9a3d97a6b2e8f37f68
Author: lain <lain@soykaf.club>
Date:   Thu, 21 Nov 2019 12:22:46 +0000

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

Remove version mismatch warning

See merge request pleroma/pleroma!2001

Diffstat:

Mmix.exs22++++++++--------------
1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/mix.exs b/mix.exs @@ -194,27 +194,21 @@ defmodule Pleroma.Mixfile do identifier_filter = ~r/[^0-9a-z\-]+/i # Pre-release version, denoted from patch version with a hyphen - {git_tag, git_pre_release} = + git_pre_release = 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), - ahead <- String.replace(describe, tag, ""), - ahead <- String.trim_leading(ahead, "-") do - {String.replace_prefix(tag, "v", ""), if(ahead != "", do: String.trim(ahead))} + {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"]) - {nil, "0-g" <> String.trim(commit_hash)} + "0-g" <> String.trim(commit_hash) end - if git_tag && version != git_tag do - Mix.shell().error( - "Application version #{inspect(version)} does not match git tag #{inspect(git_tag)}" - ) - end - # Branch name as pre-release version component, denoted with a dot branch_name = with {branch_name, 0} <- System.cmd("git", ["rev-parse", "--abbrev-ref", "HEAD"]),