projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'docs/remove-tootdon' into 'develop'
[akkoma]
/
mix.exs
diff --git
a/mix.exs
b/mix.exs
index 3e3a21e427789e9a2e5aab159cf5744ad60d738e..5484c43ef53a299e5da4099b9bb02cbc523d04be 100644
(file)
--- a/
mix.exs
+++ b/
mix.exs
@@
-37,14
+37,14
@@
defmodule Pleroma.Mixfile do
pleroma: [
include_executables_for: [:unix],
applications: [ex_syslogger: :load, syslog: :load],
pleroma: [
include_executables_for: [:unix],
applications: [ex_syslogger: :load, syslog: :load],
- steps: [:assemble, ©_
pleroma_ctl
/1]
+ steps: [:assemble, ©_
files
/1]
]
]
]
end
]
]
]
end
- def copy_
pleroma_ctl
(%{path: target_path} = release) do
- File.cp
!("./rel/pleroma_ctl", Path.join([target_path, "bin", "pleroma_ctl"])
)
+ def copy_
files
(%{path: target_path} = release) do
+ File.cp
_r!("./rel/files", target_path
)
release
end
release
end
@@
-85,7
+85,7
@@
defmodule Pleroma.Mixfile do
# Type `mix help deps` for examples and options.
defp deps do
[
# Type `mix help deps` for examples and options.
defp deps do
[
- {:phoenix, "~> 1.4.
1
"},
+ {:phoenix, "~> 1.4.
8
"},
{:plug_cowboy, "~> 2.0"},
{:phoenix_pubsub, "~> 1.1"},
{:phoenix_ecto, "~> 4.0"},
{:plug_cowboy, "~> 2.0"},
{:phoenix_pubsub, "~> 1.1"},
{:phoenix_ecto, "~> 4.0"},
@@
-108,7
+108,7
@@
defmodule Pleroma.Mixfile do
{:ex_aws, "~> 2.0"},
{:ex_aws_s3, "~> 2.0"},
{:earmark, "~> 1.3"},
{:ex_aws, "~> 2.0"},
{:ex_aws_s3, "~> 2.0"},
{:earmark, "~> 1.3"},
- {:bbcode, "~> 0.1"},
+ {:bbcode, "~> 0.1
.1
"},
{:ex_machina, "~> 2.3", only: :test},
{:credo, "~> 0.9.3", only: [:dev, :test]},
{:mock, "~> 0.3.3", only: :test},
{:ex_machina, "~> 2.3", only: :test},
{:credo, "~> 0.9.3", only: [:dev, :test]},
{:mock, "~> 0.3.3", only: :test},
@@
-126,7
+126,7
@@
defmodule Pleroma.Mixfile do
{:ueberauth, "~> 0.4"},
{:auto_linker,
git: "https://git.pleroma.social/pleroma/auto_linker.git",
{:ueberauth, "~> 0.4"},
{:auto_linker,
git: "https://git.pleroma.social/pleroma/auto_linker.git",
- ref: "
e2385402bcd24fc659fee83b3eb8863b0528ad42
"},
+ ref: "
95e8188490e97505c56636c1379ffdf036c1fdde
"},
{:http_signatures,
git: "https://git.pleroma.social/pleroma/http_signatures.git",
ref: "9789401987096ead65646b52b5a2ca6bf52fc531"},
{:http_signatures,
git: "https://git.pleroma.social/pleroma/http_signatures.git",
ref: "9789401987096ead65646b52b5a2ca6bf52fc531"},
@@
-154,6
+154,8
@@
defmodule Pleroma.Mixfile do
# See the documentation for `Mix` for more info on aliases.
defp aliases do
[
# See the documentation for `Mix` for more info on aliases.
defp aliases do
[
+ "ecto.migrate": ["pleroma.ecto.migrate"],
+ "ecto.rollback": ["pleroma.ecto.rollback"],
"ecto.setup": ["ecto.create", "ecto.migrate", "run priv/repo/seeds.exs"],
"ecto.reset": ["ecto.drop", "ecto.setup"],
test: ["ecto.create --quiet", "ecto.migrate", "test"]
"ecto.setup": ["ecto.create", "ecto.migrate", "run priv/repo/seeds.exs"],
"ecto.reset": ["ecto.drop", "ecto.setup"],
test: ["ecto.create --quiet", "ecto.migrate", "test"]
@@
-178,7
+180,7
@@
defmodule Pleroma.Mixfile do
else
_ ->
{commit_hash, 0} = System.cmd("git", ["rev-parse", "--short", "HEAD"])
else
_ ->
{commit_hash, 0} = System.cmd("git", ["rev-parse", "--short", "HEAD"])
- {nil, "-g" <> String.trim(commit_hash)}
+ {nil, "-
0-
g" <> String.trim(commit_hash)}
end
if git_tag && version != git_tag do
end
if git_tag && version != git_tag do
@@
-207,16
+209,17
@@
defmodule Pleroma.Mixfile do
branch_name =
with {branch_name, 0} <- System.cmd("git", ["rev-parse", "--abbrev-ref", "HEAD"]),
branch_name =
with {branch_name, 0} <- System.cmd("git", ["rev-parse", "--abbrev-ref", "HEAD"]),
+ branch_name <- System.get_env("PLEROMA_BUILD_BRANCH") || branch_name,
true <- branch_name != "master" do
true <- branch_name != "master" do
- "-" <> String.trim(branch_name)
- end
+ branch_name =
+ String.trim(branch_name)
+ |> String.replace(~r/[^0-9a-z\-\.]+/i, "-")
- full_version =
- [version, git_pre_release, branch_name, build]
- |> Enum.filter(fn string -> string && string != "" end)
- |> Enum.join()
+ "-" <> branch_name
+ end
- Mix.shell().info("Project version: #{full_version}")
- full_version
+ [version, git_pre_release, branch_name, build]
+ |> Enum.filter(fn string -> string && string != "" end)
+ |> Enum.join()
end
end
end
end