X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=mix.exs;h=dcb9d9ea8ff10598ffbddbe4be2b1119575df29f;hb=248020075982a18534aebec3ff63eee0ae6185f4;hp=3a605b4553d41c74ede5cd731007555f28736342;hpb=a0f101ee806af06bcd4271cd8d57d11ff85ea11a;p=akkoma diff --git a/mix.exs b/mix.exs index 3a605b455..dcb9d9ea8 100644 --- a/mix.exs +++ b/mix.exs @@ -4,7 +4,7 @@ defmodule Pleroma.Mixfile do def project do [ app: :pleroma, - version: version("1.0.0"), + version: version("1.1.50"), elixir: "~> 1.8", elixirc_paths: elixirc_paths(Mix.env()), compilers: [:phoenix, :gettext] ++ Mix.compilers(), @@ -69,6 +69,7 @@ defmodule Pleroma.Mixfile do end # Specifies which paths to compile per environment. + defp elixirc_paths(:benchmark), do: ["lib", "benchmarks"] defp elixirc_paths(:test), do: ["lib", "test/support"] defp elixirc_paths(_), do: ["lib"] @@ -220,7 +221,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.any?(["master", "HEAD", "release/", "stable"], fn name -> + String.starts_with?(name, branch_name) + end) do branch_name = branch_name |> String.trim()