gitlab
/
omnibus-gitlab
mirror of https://gitlab.com/gitlab-org/omnibus-gitlab.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'parallelize_bundle_install' into 'master' 

Parallelize 'bundle install'

See merge request !234
This commit is contained in:
Marin Jankovski 2014-10-31 12:04:20 +00:00
parent 9ae03706a1 5dd3646eaf
commit c53e92b80f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/software/gitlab-ci.rb
View File

@ -33,7 +33,7 @@ build do
bundle_without = %w{development test}
bundle_without << "mysql" unless EE
bundle "install --without #{bundle_without.join(" ")} --path=#{install_dir}/embedded/service/gem", :env => env
bundle "install --without #{bundle_without.join(" ")} --path=#{install_dir}/embedded/service/gem --jobs #{max_build_jobs}", :env => env
# Record the current Git revision to be displayed in the app
command "git log --pretty=format:'%h' -n 1 > REVISION"

2
config/software/gitlab-rails.rb
View File

@ -47,7 +47,7 @@ build do
bundle_without = %w{development test}
bundle_without << "mysql" unless EE
bundle "install --without #{bundle_without.join(" ")} --path=#{install_dir}/embedded/service/gem", :env => env
bundle "install --without #{bundle_without.join(" ")} --path=#{install_dir}/embedded/service/gem --jobs #{max_build_jobs}", :env => env
# In order to precompile the assets, we need to get to a state where rake can
# load the Rails environment.