From 8376ca1ddae804773c10c1a1c7f0d6ed1af9b617 Mon Sep 17 00:00:00 2001 From: itepechi <72330683+itepechi@users.noreply.github.com> Date: Thu, 26 Oct 2023 05:52:44 +0900 Subject: [PATCH] Do not hardcode fork name into version name fixes build errors in certain situations --- mix.exs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mix.exs b/mix.exs index 8fa86cf00..f78e1c173 100644 --- a/mix.exs +++ b/mix.exs @@ -4,7 +4,7 @@ defmodule Pleroma.Mixfile do def project do [ app: :pleroma, - version: version("3.10.3+bnakkoma"), + version: version("3.10.3"), elixir: "~> 1.14", elixirc_paths: elixirc_paths(Mix.env()), compilers: Mix.compilers(), @@ -279,7 +279,7 @@ defmodule Pleroma.Mixfile do branch_name <- String.trim(branch_name), branch_name <- System.get_env("PLEROMA_BUILD_BRANCH") || branch_name, true <- - !Enum.any?(["master", "HEAD", "release/", "stable"], fn name -> + !Enum.any?(["master", "HEAD", "release/", "stable", "bnakkoma"], fn name -> String.starts_with?(name, branch_name) end) do branch_name = @@ -296,7 +296,7 @@ defmodule Pleroma.Mixfile do cond do name = Application.get_env(:pleroma, :build_name) -> name name = System.get_env("PLEROMA_BUILD_NAME") -> name - true -> nil + true -> "bnakkoma" end env_name = if Mix.env() != :prod, do: to_string(Mix.env())