projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'conversation-update-on-dm-delete' into 'develop'
[akkoma]
/
mix.exs
diff --git
a/mix.exs
b/mix.exs
index 0981ee8565a4860773a3170ce764e91be56449a9..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
@@
-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},
@@
-209,6
+209,7
@@
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
branch_name =
String.trim(branch_name)
true <- branch_name != "master" do
branch_name =
String.trim(branch_name)