Skip to content

Commit c0770ba

Browse files
author
José Valim
committed
Include archive.check inside deps.check
1 parent 788a3cf commit c0770ba

File tree

8 files changed

+24
-10
lines changed

8 files changed

+24
-10
lines changed

lib/mix/lib/mix/tasks/clean.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ defmodule Mix.Tasks.Clean do
4747

4848
# Loadpaths without checks because compilers may be defined in deps.
4949
defp loadpaths! do
50-
Mix.Task.run "loadpaths", ["--no-elixir-version-check", "--no-deps-check", "--no-archives-check"]
50+
Mix.Task.run "loadpaths", ["--no-elixir-version-check", "--no-deps-check"]
5151
Mix.Task.reenable "loadpaths"
5252
end
5353
end

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ defmodule Mix.Tasks.Compile do
9797

9898
# Loadpaths without checks because compilers may be defined in deps.
9999
defp loadpaths! do
100-
Mix.Task.run "loadpaths", ["--no-elixir-version-check", "--no-deps-check", "--no-archives-check"]
100+
Mix.Task.run "loadpaths", ["--no-elixir-version-check", "--no-deps-check"]
101101
Mix.Task.reenable "loadpaths"
102102
end
103103

lib/mix/lib/mix/tasks/deps.check.ex

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,15 @@ defmodule Mix.Tasks.Deps.Check do
1414
## Command line options
1515
1616
* `--no-compile` - do not compile dependencies
17+
* `--no-archives-check` - do not check archives
1718
1819
"""
1920
@spec run(OptionParser.argv) :: :ok
2021
def run(args) do
22+
unless "--no-archives-check" in args do
23+
Mix.Task.run "archive.check", args
24+
end
25+
2126
all = Enum.map(loaded(env: Mix.env), &check_lock/1)
2227

2328
_ = prune_deps(all)

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ defmodule Mix.Tasks.Deps.Compile do
3737

3838
@spec run(OptionParser.argv) :: :ok
3939
def run(args) do
40+
unless "--no-archives-check" in args do
41+
Mix.Task.run "archive.check", args
42+
end
43+
4044
Mix.Project.get!
4145

4246
case OptionParser.parse(args, switches: @switches) do

lib/mix/lib/mix/tasks/deps.get.ex

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,15 @@ defmodule Mix.Tasks.Deps.Get do
99
1010
## Command line options
1111
12-
* `--only` - only fetch dependencies for given environment
12+
* `--only` - only fetch dependencies for given environment
13+
* `--no-archives-check` - do not check archives before fetching deps
1314
"""
1415
@spec run(OptionParser.argv) :: :ok
1516
def run(args) do
17+
unless "--no-archives-check" in args do
18+
Mix.Task.run "archive.check", args
19+
end
20+
1621
Mix.Project.get!
1722
{opts, _, _} = OptionParser.parse(args, switches: [only: :string])
1823

lib/mix/lib/mix/tasks/deps.update.ex

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,15 @@ defmodule Mix.Tasks.Deps.Update do
1313
1414
## Command line options
1515
16-
* `--all` - update all dependencies
16+
* `--all` - update all dependencies
1717
* `--only` - only fetch dependencies for given environment
18+
* `--no-archives-check` - do not check archives before fetching deps
1819
"""
1920
@spec run(OptionParser.argv) :: [atom]
2021
def run(args) do
22+
unless "--no-archives-check" in args do
23+
Mix.Task.run "archive.check", args
24+
end
2125
Mix.Project.get!
2226
{opts, rest, _} = OptionParser.parse(args, switches: [all: :boolean, only: :string])
2327

lib/mix/lib/mix/tasks/help.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ defmodule Mix.Tasks.Help do
109109

110110
# Loadpaths without checks because tasks may be defined in deps.
111111
defp loadpaths! do
112-
Mix.Task.run "loadpaths", ["--no-elixir-version-check", "--no-deps-check", "--no-archives-check"]
112+
Mix.Task.run "loadpaths", ["--no-elixir-version-check", "--no-deps-check"]
113113
Mix.Task.reenable "loadpaths"
114114
end
115115

lib/mix/lib/mix/tasks/loadpaths.ex

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ defmodule Mix.Tasks.Loadpaths do
77
## Command line options
88

99
* `--no-archives-check` - do not check archive
10-
* `--no-deps-check` - do not check dependencies
10+
* `--no-deps-check` - do not check dependencies (also implies --no-archives-check)
1111
* `--no-elixir-version-check` - do not check Elixir version
1212

1313
"""
@@ -20,10 +20,6 @@ defmodule Mix.Tasks.Loadpaths do
2020
check_elixir_version(config, args)
2121
end
2222

23-
unless "--no-archives-check" in args do
24-
Mix.Task.run "archive.check", args
25-
end
26-
2723
# --no-deps is used only internally. It has not purpose
2824
# from Mix.CLI because the CLI itself already loads deps.
2925
unless "--no-deps" in args do

0 commit comments

Comments
 (0)