projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/ogp-title' into 'develop'
[akkoma]
/
mix.exs
diff --git
a/mix.exs
b/mix.exs
index df1a7ced44643f77795b9509dce787921d16115d..db7a30f99ec7027ae869acb33ce9f28fdd217930 100644
(file)
--- a/
mix.exs
+++ b/
mix.exs
@@
-32,10
+32,22
@@
defmodule Pleroma.Mixfile do
],
main: "readme",
output: "priv/static/doc"
],
main: "readme",
output: "priv/static/doc"
+ ],
+ releases: [
+ pleroma: [
+ include_executables_for: [:unix],
+ applications: [ex_syslogger: :load, syslog: :load],
+ steps: [:assemble, ©_pleroma_ctl/1]
+ ]
]
]
end
]
]
end
+ def copy_pleroma_ctl(%{path: target_path} = release) do
+ File.cp!("./rel/pleroma_ctl", Path.join([target_path, "bin", "pleroma_ctl"]))
+ release
+ end
+
# Configuration for the OTP application.
#
# Type `mix help compile.app` for more information.
# Configuration for the OTP application.
#
# Type `mix help compile.app` for more information.
@@
-114,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: "
c00c4e75b35367fa42c95ffd9b8c455bf9995829
"},
+ ref: "
e2385402bcd24fc659fee83b3eb8863b0528ad42
"},
{: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"},
@@
-129,7
+141,7
@@
defmodule Pleroma.Mixfile do
{:quack, "~> 0.1.1"},
{:benchee, "~> 1.0"},
{:esshd, "~> 0.1.0", runtime: Application.get_env(:esshd, :enabled, false)},
{:quack, "~> 0.1.1"},
{:benchee, "~> 1.0"},
{:esshd, "~> 0.1.0", runtime: Application.get_env(:esshd, :enabled, false)},
- {:ex_rated, "~> 1.
2
"},
+ {:ex_rated, "~> 1.
3
"},
{:plug_static_index_html, "~> 1.0.0"},
{:excoveralls, "~> 0.11.1", only: :test}
] ++ oauth_deps()
{:plug_static_index_html, "~> 1.0.0"},
{:excoveralls, "~> 0.11.1", only: :test}
] ++ oauth_deps()
@@
-157,7
+169,8
@@
defmodule Pleroma.Mixfile do
# * the mix environment if different than prod
defp version(version) do
{git_tag, git_pre_release} =
# * the mix environment if different than prod
defp version(version) do
{git_tag, git_pre_release} =
- with {tag, 0} <- System.cmd("git", ["describe", "--tags", "--abbrev=0"]),
+ with {tag, 0} <-
+ System.cmd("git", ["describe", "--tags", "--abbrev=0"], stderr_to_stdout: true),
tag = String.trim(tag),
{describe, 0} <- System.cmd("git", ["describe", "--tags", "--abbrev=8"]),
describe = String.trim(describe),
tag = String.trim(tag),
{describe, 0} <- System.cmd("git", ["describe", "--tags", "--abbrev=8"]),
describe = String.trim(describe),