sjw
/
pleroma
mirror of https://git.pleroma.social/sjw/pleroma.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'fix/version-branch-skip' into 'stable' 

Fix hiding branch name logic

See merge request pleroma/pleroma!1845
This commit is contained in:
rinpatch 2019-10-14 19:14:47 +00:00
parent 988654a720 0733da3205
commit c00797d08e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mix.exs
View File

@ -216,7 +216,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 =