Compare commits

...

2 Commits

Author SHA1 Message Date
itepechi 8376ca1dda Do not hardcode fork name into version name
fixes build errors in certain situations
2023-10-26 05:52:44 +09:00
itepechi 3a7967d331 Revert "Fix invalid version number on 'mix test'"
This reverts commit 93cf428e2a.
2023-10-26 05:50:20 +09:00
1 changed files with 3 additions and 3 deletions

View File

@ -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())