Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Update Travis config.

* Properly generate test_server.yml
* Use a secondary Gemfile instead of ENV vars.
  • Loading branch information...
commit 123f7b68f693406d4bfda0511fc555ddb8b433f3 1 parent 5e89166
@seancribbs seancribbs authored
Showing with 10 additions and 10 deletions.
  1. +7 −4 .travis.yml
  2. +0 −6 Gemfile
  3. +3 −0  Gemfile.rails31
View
11 .travis.yml
@@ -1,9 +1,12 @@
-env:
- - "RIAK_BIN_DIR=/usr/sbin"
- - "RIAK_BIN_DIR=/usr/sbin RAILS31=true"
+gemfiles:
+ - Gemfile
+ - Gemfile.rails31
rvm:
- 1.8.7
- 1.9.2
- 1.9.3
- jruby
-before_script: ! 'echo "root: /tmp/.riaktest\nsource: $RIAK_BIN_DIR" > spec/support/test_server.yml; ulimit -n 2048'
+before_script:
+ - ! 'echo "root: /tmp/.riaktest" > spec/support/test_server.yml'
+ - ! 'echo "source: /usr/sbin" >> spec/support/test_server.yml'
+ - "ulimit -n 2048"
View
6 Gemfile
@@ -2,12 +2,6 @@ source :rubygems
gemspec
-if ENV['RAILS31']
- gem 'activemodel', '~> 3.1.0'
-else
- gem 'activemodel', '~> 3.0.10'
-end
-
if ENV['TRAVIS']
# Once the APIs are stable, this should be removed
gem 'riak-client', :git => "git://github.com/basho/riak-ruby-client.git"
View
3  Gemfile.rails31
@@ -0,0 +1,3 @@
+gem 'activemodel', '~> 3.1.0'
+
+instance_eval File.read(File.expand_path('../Gemfile', __FILE__))
Please sign in to comment.
Something went wrong with that request. Please try again.