From f07003e2183c4e13a428614bd0ce39c9e84e2da2 Mon Sep 17 00:00:00 2001 From: Ivan Tashkinov Date: Thu, 20 Jun 2019 17:54:16 +0300 Subject: [PATCH 1/2] Fixed mix version computed for underscore-containing branches to be of SemVer format. --- mix.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mix.exs b/mix.exs index 7f8e36cbb..30584cc92 100644 --- a/mix.exs +++ b/mix.exs @@ -212,7 +212,7 @@ defmodule Pleroma.Mixfile do true <- branch_name != "master" do branch_name = String.trim(branch_name) - |> String.replace(~r/\W+/, "-") + |> String.replace(~r/[\W_]+/, "-") "-" <> branch_name end From 259ffe00620ae8dd0cbfd5313024107e59f96ffc Mon Sep 17 00:00:00 2001 From: Ivan Tashkinov Date: Fri, 21 Jun 2019 17:19:29 +0300 Subject: [PATCH 2/2] Fixed branch name substitutions for mix version (to comply to SemVer format). --- mix.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mix.exs b/mix.exs index 30584cc92..0981ee856 100644 --- a/mix.exs +++ b/mix.exs @@ -212,7 +212,7 @@ defmodule Pleroma.Mixfile do true <- branch_name != "master" do branch_name = String.trim(branch_name) - |> String.replace(~r/[\W_]+/, "-") + |> String.replace(~r/[^0-9a-z\-\.]+/i, "-") "-" <> branch_name end