Merge branch 'develop' into support/update_oban
This commit is contained in:
commit
648cc699e5
79 changed files with 1820 additions and 276 deletions
14
mix.exs
14
mix.exs
|
|
@ -37,12 +37,21 @@ defmodule Pleroma.Mixfile do
|
|||
pleroma: [
|
||||
include_executables_for: [:unix],
|
||||
applications: [ex_syslogger: :load, syslog: :load],
|
||||
steps: [:assemble, ©_files/1, ©_nginx_config/1]
|
||||
steps: [:assemble, &put_otp_version/1, ©_files/1, ©_nginx_config/1]
|
||||
]
|
||||
]
|
||||
]
|
||||
end
|
||||
|
||||
def put_otp_version(%{path: target_path} = release) do
|
||||
File.write!(
|
||||
Path.join([target_path, "OTP_VERSION"]),
|
||||
Pleroma.OTPVersion.version()
|
||||
)
|
||||
|
||||
release
|
||||
end
|
||||
|
||||
def copy_files(%{path: target_path} = release) do
|
||||
File.cp_r!("./rel/files", target_path)
|
||||
release
|
||||
|
|
@ -179,7 +188,8 @@ defmodule Pleroma.Mixfile do
|
|||
git: "https://git.pleroma.social/pleroma/elixir-libraries/elixir-captcha.git",
|
||||
ref: "e0f16822d578866e186a0974d65ad58cddc1e2ab"},
|
||||
{:mox, "~> 0.5", only: :test},
|
||||
{:restarter, path: "./restarter"}
|
||||
{:restarter, path: "./restarter"},
|
||||
{:open_api_spex, "~> 3.6"}
|
||||
] ++ oauth_deps()
|
||||
end
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue