diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-10-14 16:47:27 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-10-14 16:47:27 +0000 |
| commit | 13966f150469e2e7b6e02ffc8a7ab65b7c7bfaa7 (patch) | |
| tree | e3a284e6613f2b984617c811705005e373bbf74e /mix.exs | |
| parent | 1f99abbeba88f852e02ac784d0ce7309785f3387 (diff) | |
| parent | 2b6cd10b68c01bb16f94c911da6fce51511a1a5a (diff) | |
| download | pleroma-13966f150469e2e7b6e02ffc8a7ab65b7c7bfaa7.tar.gz pleroma-13966f150469e2e7b6e02ffc8a7ab65b7c7bfaa7.zip | |
Merge branch 'backport/1.1-branch-name-change' into 'maint/1.1'
Backport/1.1 branch name change
See merge request pleroma/pleroma!1841
Diffstat (limited to 'mix.exs')
| -rw-r--r-- | mix.exs | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -215,7 +215,10 @@ defmodule Pleroma.Mixfile do with {branch_name, 0} <- System.cmd("git", ["rev-parse", "--abbrev-ref", "HEAD"]), branch_name <- String.trim(branch_name), branch_name <- System.get_env("PLEROMA_BUILD_BRANCH") || branch_name, - true <- branch_name not in ["master", "HEAD"] do + true <- + !Enum.all?(["master", "HEAD", "release/", "stable"], fn name -> + String.starts_with?(name, branch_name) + end) do branch_name = branch_name |> String.trim() |