From 6e57809322f7f69d5f8ad5c80abd02a4cbd172f5 Mon Sep 17 00:00:00 2001 From: Cocoa Date: Tue, 12 Nov 2024 10:54:22 +0000 Subject: [PATCH 1/2] support setting `:force_build` opts in config Signed-off-by: Cocoa --- CHANGELOG.md | 5 +++++ lib/mix/tasks/compile.elixir_make.ex | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 274ebb1..68123a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ ## v0.9.0-dev * Rely on certificate stores provided by Erlang/OTP 25+ + * Support setting `:force_build` opts in config: + + ```elixir + config :elixir_make, :force_build, app1: true, app2: false + ``` ## v0.8.4 (2024-06-04) diff --git a/lib/mix/tasks/compile.elixir_make.ex b/lib/mix/tasks/compile.elixir_make.ex index 6f45fc5..cb524a8 100644 --- a/lib/mix/tasks/compile.elixir_make.ex +++ b/lib/mix/tasks/compile.elixir_make.ex @@ -136,7 +136,11 @@ defmodule Mix.Tasks.Compile.ElixirMake do config = Mix.Project.config() app = config[:app] version = config[:version] - force_build = pre_release?(version) or Keyword.get(config, :make_force_build, false) + + force_build = + pre_release?(version) or Keyword.get(config, :make_force_build, false) or + Keyword.get(Application.get_env(:elixir_make, :force_build, []), app) + {precompiler_type, precompiler} = config[:make_precompiler] || {nil, nil} cond do From 34c608ab799ba0732771b3326b59740b3288aadd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Tue, 12 Nov 2024 12:04:41 +0100 Subject: [PATCH 2/2] Update lib/mix/tasks/compile.elixir_make.ex --- lib/mix/tasks/compile.elixir_make.ex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/mix/tasks/compile.elixir_make.ex b/lib/mix/tasks/compile.elixir_make.ex index cb524a8..56d6c2d 100644 --- a/lib/mix/tasks/compile.elixir_make.ex +++ b/lib/mix/tasks/compile.elixir_make.ex @@ -139,7 +139,7 @@ defmodule Mix.Tasks.Compile.ElixirMake do force_build = pre_release?(version) or Keyword.get(config, :make_force_build, false) or - Keyword.get(Application.get_env(:elixir_make, :force_build, []), app) + Keyword.get(Application.get_env(:elixir_make, :force_build, []), app, false) {precompiler_type, precompiler} = config[:make_precompiler] || {nil, nil}