Skip to content

Commit

Permalink
Merge pull request #3914 from rubygems/restore_package_all_flag
Browse files Browse the repository at this point in the history
Restore `bundle cache --all` in all cases

(cherry picked from commit 5be5e29)
  • Loading branch information
deivid-rodriguez committed Oct 6, 2020
1 parent 58273d8 commit 0c4726b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
7 changes: 3 additions & 4 deletions bundler/lib/bundler/cli.rb
Expand Up @@ -440,10 +440,9 @@ def outdated(*gems)
end

desc "cache [OPTIONS]", "Locks and then caches all of the gems into vendor/cache"
unless Bundler.feature_flag.cache_all?
method_option "all", :type => :boolean,
:banner => "Include all sources (including path and git)."
end
method_option "all", :type => :boolean,
:default => Bundler.feature_flag.cache_all?,
:banner => "Include all sources (including path and git)."
method_option "all-platforms", :type => :boolean, :banner => "Include gems for all platforms present in the lockfile, not only the current one"
method_option "cache-path", :type => :string, :banner =>
"Specify a different cache path than the default (vendor/cache)."
Expand Down
2 changes: 1 addition & 1 deletion bundler/man/bundle-config.1
Expand Up @@ -154,7 +154,7 @@ The following is a list of all configuration keys and their purpose\. You can le
\fBbin\fR (\fBBUNDLE_BIN\fR): Install executables from gems in the bundle to the specified directory\. Defaults to \fBfalse\fR\.
.
.IP "\(bu" 4
\fBcache_all\fR (\fBBUNDLE_CACHE_ALL\fR): Cache all gems, including path and git gems\.
\fBcache_all\fR (\fBBUNDLE_CACHE_ALL\fR): Cache all gems, including path and git gems\. This needs to be explicitly configured on bundler 1 and bundler 2, but will be the default on bundler 3\.
.
.IP "\(bu" 4
\fBcache_all_platforms\fR (\fBBUNDLE_CACHE_ALL_PLATFORMS\fR): Cache gems for all platforms\.
Expand Down
3 changes: 2 additions & 1 deletion bundler/man/bundle-config.1.ronn
Expand Up @@ -150,7 +150,8 @@ learn more about their operation in [bundle install(1)](bundle-install.1.html).
Install executables from gems in the bundle to the specified directory.
Defaults to `false`.
* `cache_all` (`BUNDLE_CACHE_ALL`):
Cache all gems, including path and git gems.
Cache all gems, including path and git gems. This needs to be explicitly
configured on bundler 1 and bundler 2, but will be the default on bundler 3.
* `cache_all_platforms` (`BUNDLE_CACHE_ALL_PLATFORMS`):
Cache gems for all platforms.
* `cache_path` (`BUNDLE_CACHE_PATH`):
Expand Down

0 comments on commit 0c4726b

Please sign in to comment.