From e93cc561cd42ff4ca7f3c95cdbf8dfa7fb9f4a74 Mon Sep 17 00:00:00 2001 From: Alexander Strizhakov Date: Sat, 25 Jan 2020 18:42:04 +0300 Subject: restarting pleroma from outside application --- mix.exs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'mix.exs') diff --git a/mix.exs b/mix.exs index 0aa7c862f..1d0b59e56 100644 --- a/mix.exs +++ b/mix.exs @@ -8,7 +8,7 @@ defmodule Pleroma.Mixfile do elixir: "~> 1.8", elixirc_paths: elixirc_paths(Mix.env()), compilers: [:phoenix, :gettext] ++ Mix.compilers(), - elixirc_options: [warnings_as_errors: true], + elixirc_options: [warnings_as_errors: warnings_as_errors(Mix.env())], xref: [exclude: [:eldap]], start_permanent: Mix.env() == :prod, aliases: aliases(), @@ -73,6 +73,11 @@ defmodule Pleroma.Mixfile do defp elixirc_paths(:test), do: ["lib", "test/support"] defp elixirc_paths(_), do: ["lib"] + defp warnings_as_errors(:prod), do: false + # Uncomment this if you need testing configurable_from_database logic + # defp warnings_as_errors(:dev), do: false + defp warnings_as_errors(_), do: true + # Specifies OAuth dependencies. defp oauth_deps do oauth_strategy_packages = @@ -166,7 +171,8 @@ defmodule Pleroma.Mixfile do {:captcha, git: "https://git.pleroma.social/pleroma/elixir-libraries/elixir-captcha.git", ref: "e0f16822d578866e186a0974d65ad58cddc1e2ab"}, - {:mox, "~> 0.5", only: :test} + {:mox, "~> 0.5", only: :test}, + {:restarter, git: "https://git.pleroma.social/alex.s/restarter"} ] ++ oauth_deps() end -- cgit v1.2.3 From 91ea3ed82cc29f02ae8eec94e4e4ced325a7e008 Mon Sep 17 00:00:00 2001 From: Alexander Strizhakov Date: Tue, 28 Jan 2020 15:19:05 +0300 Subject: moving restarter application into pleroma repo --- mix.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mix.exs') diff --git a/mix.exs b/mix.exs index 1d0b59e56..2608f986e 100644 --- a/mix.exs +++ b/mix.exs @@ -172,7 +172,7 @@ defmodule Pleroma.Mixfile do git: "https://git.pleroma.social/pleroma/elixir-libraries/elixir-captcha.git", ref: "e0f16822d578866e186a0974d65ad58cddc1e2ab"}, {:mox, "~> 0.5", only: :test}, - {:restarter, git: "https://git.pleroma.social/alex.s/restarter"} + {:restarter, path: "../restarter"} ] ++ oauth_deps() end -- cgit v1.2.3 From aa3ba635131fb05b09ab487bdf68cbe5dda98257 Mon Sep 17 00:00:00 2001 From: Alexander Strizhakov Date: Tue, 28 Jan 2020 15:41:45 +0300 Subject: like this --- mix.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mix.exs') diff --git a/mix.exs b/mix.exs index 2608f986e..ad23c7414 100644 --- a/mix.exs +++ b/mix.exs @@ -172,7 +172,7 @@ 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, in_umbrella: true} ] ++ oauth_deps() end -- cgit v1.2.3 From 251bbd794a696655bee5df7a31727db7dfa60375 Mon Sep 17 00:00:00 2001 From: Alexander Strizhakov Date: Tue, 28 Jan 2020 13:29:44 +0000 Subject: Apply suggestion to mix.exs --- mix.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mix.exs') diff --git a/mix.exs b/mix.exs index ad23c7414..8cbea6f75 100644 --- a/mix.exs +++ b/mix.exs @@ -172,7 +172,7 @@ defmodule Pleroma.Mixfile do git: "https://git.pleroma.social/pleroma/elixir-libraries/elixir-captcha.git", ref: "e0f16822d578866e186a0974d65ad58cddc1e2ab"}, {:mox, "~> 0.5", only: :test}, - {:restarter, in_umbrella: true} + {:restarter, path: "./restarter"} ] ++ oauth_deps() end -- cgit v1.2.3 From 93b9f226e0163519b0bbb111191abef45893f23e Mon Sep 17 00:00:00 2001 From: Alexander Strizhakov Date: Tue, 28 Jan 2020 16:32:33 +0300 Subject: path fix --- mix.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mix.exs') diff --git a/mix.exs b/mix.exs index 8cbea6f75..2608f986e 100644 --- a/mix.exs +++ b/mix.exs @@ -172,7 +172,7 @@ 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"} ] ++ oauth_deps() end -- cgit v1.2.3 From 33bd8fbffea79b8ca510a098ad4654b8f01324d6 Mon Sep 17 00:00:00 2001 From: Alexander Strizhakov Date: Tue, 28 Jan 2020 18:02:11 +0300 Subject: filename and test fixes --- mix.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mix.exs') diff --git a/mix.exs b/mix.exs index 2608f986e..8cbea6f75 100644 --- a/mix.exs +++ b/mix.exs @@ -172,7 +172,7 @@ 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"} ] ++ oauth_deps() end -- cgit v1.2.3