Merge branch 'backport/develop-branch-hiding-fix' into 'develop'
Backport "Fix hiding branch name logic" to develop See merge request pleroma/pleroma!1846
This commit is contained in:
commit
e0da0d4f9e
2
mix.exs
2
mix.exs
@ -221,7 +221,7 @@ defmodule Pleroma.Mixfile do
|
|||||||
branch_name <- String.trim(branch_name),
|
branch_name <- String.trim(branch_name),
|
||||||
branch_name <- System.get_env("PLEROMA_BUILD_BRANCH") || branch_name,
|
branch_name <- System.get_env("PLEROMA_BUILD_BRANCH") || branch_name,
|
||||||
true <-
|
true <-
|
||||||
!Enum.all?(["master", "HEAD", "release/", "stable"], fn name ->
|
!Enum.any?(["master", "HEAD", "release/", "stable"], fn name ->
|
||||||
String.starts_with?(name, branch_name)
|
String.starts_with?(name, branch_name)
|
||||||
end) do
|
end) do
|
||||||
branch_name =
|
branch_name =
|
||||||
|
Loading…
Reference in New Issue
Block a user