Skip to content

Commit

Permalink
Fix bundle override in ManageIQ::Environment
Browse files Browse the repository at this point in the history
Commit 04d9a75 overrides Travis' built-in bundle install, which handles
bundle caching as well as parallel installs and retries, but did so
without any of those feature causing them to be lost in all of the
provider repos.

http://talk.manageiq.org/t/can-we-speed-up-small-repos-on-travis/2533
  • Loading branch information
Fryguy committed Jul 17, 2017
1 parent a0e161b commit d64fe19
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions lib/manageiq/environment.rb
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,19 @@ def self.install_bundler
end

def self.bundle_install(root = APP_ROOT)
system('bundle check', :chdir => root) || system!('bundle install', :chdir => root)
system("bundle check", :chdir => root) ||
system!("bundle install #{bundle_params}", :chdir => root)
end

def self.bundle_update(root = APP_ROOT)
system!('bundle update', :chdir => root)
system!("bundle update #{bundle_params}", :chdir => root)
end

def self.bundle_params
"--jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}" if ENV['CI']
end
private_class_method :bundle_params

def self.create_database
puts "\n== Updating database =="
run_rake_task("db:create")
Expand Down

0 comments on commit d64fe19

Please sign in to comment.