File tree Expand file tree Collapse file tree 3 files changed +6
-6
lines changed Expand file tree Collapse file tree 3 files changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -96,9 +96,7 @@ defmodule Mix.Dep.Fetcher do
96
96
# it for compilation too, this is our best to try to solve the
97
97
# maximum we can at each deps.get and deps.update.
98
98
if Enum . all? ( all_deps , & available? / 1 ) do
99
- deps = ( with_depending ( deps , all_deps ) ++
100
- Enum . filter ( all_deps , fn dep -> not ok? ( dep ) end ) )
101
- |> Enum . uniq ( & ( & 1 . app ) )
99
+ deps = Enum . uniq_by ( with_depending ( deps , all_deps ) , & ( & 1 . app ) )
102
100
end
103
101
104
102
# Merge the new lock on top of the old to guarantee we don't
Original file line number Diff line number Diff line change @@ -100,6 +100,11 @@ defmodule Mix.Tasks.Deps.Compile do
100
100
"but you are running on v#{ System . version } "
101
101
end
102
102
103
+ # Force recompilation on compile status
104
+ if dep . status == :compile do
105
+ Mix.Dep.Lock . touch_manifest
106
+ end
107
+
103
108
try do
104
109
res = Mix.Task . run ( "compile" , [ "--no-deps" , "--no-elixir-version-check" ] )
105
110
:ok in List . wrap ( res )
Original file line number Diff line number Diff line change @@ -146,9 +146,6 @@ defmodule Mix.Tasks.DepsGitTest do
146
146
assert_received { :mix_shell , :info , [ "Compiled lib/a.ex" ] }
147
147
148
148
# Clear up to prepare for the update
149
- File . rm ( "_build/dev/lib/git_repo/ebin/Elixir.GitRepo.beam" )
150
- File . rm ( "_build/dev/lib/git_repo/.compile.elixir" )
151
- File . rm ( "deps/git_repo/.fetch" )
152
149
Mix.Task . clear
153
150
Mix . shell . flush
154
151
purge [ A , B , C , GitRepo ]
You can’t perform that action at this time.
0 commit comments