Skip to content

Commit 8d800f8

Browse files
committed
Apply code review suggestions
1 parent c7693b2 commit 8d800f8

File tree

4 files changed

+14
-6
lines changed

4 files changed

+14
-6
lines changed

lib/mix/lib/mix/tasks/compile.app.ex

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,9 @@ defmodule Mix.Tasks.Compile.App do
281281

282282
defp merge_project_application(best_guess, _project, application) do
283283
if not Keyword.keyword?(application) do
284-
Mix.raise("Application configuration passed as :application should be a keyword list")
284+
Mix.raise(
285+
"Application configuration passed as :application should be a keyword list, , got: #{inspect(application)}"
286+
)
285287
end
286288

287289
Keyword.merge(best_guess, validate_properties!(application))

lib/mix/lib/mix/tasks/deps.compile.ex

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -342,6 +342,13 @@ defmodule Mix.Tasks.Deps.Compile do
342342
src = Path.join(build, "_gleam_artefacts")
343343
File.mkdir(Path.join(build, "ebin"))
344344

345+
# Remove per-environment segment from the path since ProjectStack.push below will append it
346+
build_path =
347+
Mix.Project.build_path()
348+
|> Path.split()
349+
|> Enum.drop(-1)
350+
|> Path.join()
351+
345352
config =
346353
Mix.Project.deps_config()
347354
|> Keyword.merge(
@@ -350,8 +357,7 @@ defmodule Mix.Tasks.Deps.Compile do
350357
deps: toml.deps,
351358
build_per_environment: true,
352359
lockfile: "mix.lock",
353-
# Remove per-environment segment from the path since ProjectStack.push below will append it
354-
build_path: Mix.Project.build_path() |> Path.split() |> Enum.drop(-1) |> Path.join(),
360+
build_path: build_path,
355361
build_scm: dep.scm,
356362
deps_path: deps_path,
357363
deps_app_path: build,
@@ -360,10 +366,10 @@ defmodule Mix.Tasks.Deps.Compile do
360366
erlc_include_path: Path.join(build, "include")
361367
)
362368

363-
env = dep.opts[:env] || :prod
364369
old_env = Mix.env()
365370

366371
try do
372+
env = dep.opts[:env] || :prod
367373
Mix.env(env)
368374
Mix.ProjectStack.push(dep.app, config, "nofile")
369375

lib/mix/test/fixtures/gleam_dep/.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# The directory Mix will write compiled artifacts to.
22
/_build/
33

4-
# The directory gleam will write compiled artifacts to.
4+
# The directory Gleam will write compiled artifacts to.
55
/build/
66

77
# If the VM crashes, it generates a dump, let's ignore it too.

lib/mix/test/fixtures/subfolder/deeper_gleam_dep/.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# The directory Mix will write compiled artifacts to.
22
/_build/
33

4-
# The directory gleam will write compiled artifacts to.
4+
# The directory Gleam will write compiled artifacts to.
55
/build/
66

77
# If the VM crashes, it generates a dump, let's ignore it too.

0 commit comments

Comments
 (0)