Browse Source

Merge pull request #5 from saberma/saberma-enhancement/use-parallel-bundler

使用并行 bundler
Saber 10 years ago
parent
commit
96ec8d1ffb

+ 8 - 2
.travis.yml

@@ -1,11 +1,17 @@
 language: ruby
 
-bundler_args: '' # avoid travis-ci to set deployment mode by default
+bundler_args: '-j6' # avoid travis-ci to set deployment mode by default, and use parallel bundlerr
 
-before_script: bundle install
+#before_script: bundle install
 
 script: bundle exec rake spec
 
+before_install:
+  - grep -i processor /proc/cpuinfo | wc -l
+  - "echo 'gem: --no-ri --no-rdoc' > ~/.gemrc"
+  - gem install bundler --pre
+  - bundler -v
+
 rvm: 2.0.0
 
 gemfile:

+ 1 - 1
Gemfile.lock

@@ -6,7 +6,7 @@ PATH
       rails (>= 3.1.0)
 
 GEM
-  remote: http://ruby.taobao.org/
+  remote: https://rubygems.org/
   specs:
     actionmailer (3.1.12)
       actionpack (= 3.1.12)

+ 6 - 2
gemfiles/rails31.gemfile

@@ -1,9 +1,13 @@
 # This file was generated by Appraisal
 
-source "http://ruby.taobao.org"
+if ENV['TRAVIS']
+  source 'https://rubygems.org'
+else
+  source 'http://ruby.taobao.org'
+end
 
 gem "jquery-rails"
 gem "appraisal"
 gem "rails", "~> 3.1.0"
 
-gemspec :path=>"../"
+gemspec :path=>"../"

+ 1 - 1
gemfiles/rails31.gemfile.lock

@@ -6,7 +6,7 @@ PATH
       rails (>= 3.1.0)
 
 GEM
-  remote: http://ruby.taobao.org/
+  remote: https://rubygems.org/
   specs:
     actionmailer (3.1.12)
       actionpack (= 3.1.12)

+ 6 - 2
gemfiles/rails32.gemfile

@@ -1,9 +1,13 @@
 # This file was generated by Appraisal
 
-source "http://ruby.taobao.org"
+if ENV['TRAVIS']
+  source 'https://rubygems.org'
+else
+  source 'http://ruby.taobao.org'
+end
 
 gem "jquery-rails"
 gem "appraisal"
 gem "rails", "~> 3.2.0"
 
-gemspec :path=>"../"
+gemspec :path=>"../"

+ 1 - 1
gemfiles/rails32.gemfile.lock

@@ -6,7 +6,7 @@ PATH
       rails (>= 3.1.0)
 
 GEM
-  remote: http://ruby.taobao.org/
+  remote: https://rubygems.org/
   specs:
     actionmailer (3.2.14)
       actionpack (= 3.2.14)

+ 6 - 2
gemfiles/rails4.gemfile

@@ -1,9 +1,13 @@
 # This file was generated by Appraisal
 
-source "http://ruby.taobao.org"
+if ENV['TRAVIS']
+  source 'https://rubygems.org'
+else
+  source 'http://ruby.taobao.org'
+end
 
 gem "jquery-rails"
 gem "appraisal"
 gem "rails", "~> 4.0.0"
 
-gemspec :path=>"../"
+gemspec :path=>"../"

+ 1 - 1
gemfiles/rails4.gemfile.lock

@@ -6,7 +6,7 @@ PATH
       rails (>= 3.1.0)
 
 GEM
-  remote: http://ruby.taobao.org/
+  remote: https://rubygems.org/
   specs:
     actionmailer (4.0.0)
       actionpack (= 4.0.0)