Skip to content

Commit ccb5546

Browse files
committed
Always pop the project stack
1 parent 02d0567 commit ccb5546

File tree

1 file changed

+18
-15
lines changed

1 file changed

+18
-15
lines changed

lib/mix/lib/mix.ex

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -565,26 +565,29 @@ defmodule Mix do
565565
consolidate_protocols: Keyword.get(opts, :consolidate_protocols, true)
566566
]
567567

568-
:ok = Mix.ProjectStack.push(__MODULE__.InstallProject, config, "nofile")
569568
:ok = Mix.Local.append_archives()
569+
:ok = Mix.ProjectStack.push(__MODULE__.InstallProject, config, "nofile")
570570

571-
dir? = File.dir?(dir)
572-
File.mkdir_p!(dir)
571+
try do
572+
dir? = File.dir?(dir)
573+
File.mkdir_p!(dir)
573574

574-
File.cd!(dir, fn ->
575-
unless dir? do
576-
Mix.Task.run("deps.get")
577-
end
575+
File.cd!(dir, fn ->
576+
unless dir? do
577+
Mix.Task.run("deps.get")
578+
end
579+
580+
Mix.Task.run("compile")
581+
end)
578582

579-
Mix.Task.run("compile")
580-
end)
583+
for app <- Mix.Project.deps_apps() do
584+
Application.ensure_all_started(app)
585+
end
581586

582-
for app <- Mix.Project.deps_apps() do
583-
Application.ensure_all_started(app)
587+
Mix.State.put(:installed, deps)
588+
:ok
589+
after
590+
Mix.ProjectStack.pop()
584591
end
585-
586-
Mix.ProjectStack.pop()
587-
Mix.State.put(:installed, deps)
588-
:ok
589592
end
590593
end

0 commit comments

Comments
 (0)