Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Prepare to re-enable Travis-CI.

  • Loading branch information...
commit cf92ebdfcffb8785be50550b8a71d73371dba3a1 1 parent 85a9efe
@seancribbs authored
Showing with 13 additions and 16 deletions.
  1. +6 −15 .travis.yml
  2. +7 −1 Gemfile
View
21 .travis.yml
@@ -1,20 +1,11 @@
-env: "RIAK_BIN_DIR=/usr/sbin"
rvm:
- 1.8.7
- 1.9.2
-# - jruby
+ - 1.9.3
+ - jruby
before_script:
-# - "ci/disable_jruby_native"
- - "ci/create_test_server_yml"
-script: "ci/build_all"
+ - ! 'echo "root: .riaktest" > spec/support/test_server.yml'
+ - ! 'echo "source: /usr/sbin" >> spec/support/test_server.yml'
+ - "ulimit -n 2048"
notifications:
- recipients:
- - sean@basho.com
- - duff@omelia.org
- - myron.marston@gmail.com
- - nathaniel@spreedly.com
- - aphyr@aphyr.com
-branches:
- only:
- - master
- - 0.9-stable
+ email: sean@basho.com
View
8 Gemfile
@@ -1,7 +1,13 @@
source :rubygems
gem 'bundler'
-gem 'riak-client', :path => '../riak-client'
+
+if ENV['TRAVIS']
+ gem 'riak-client', :git => "git://github.com/basho/riak-ruby-client.git"
+else
+ gem 'riak-client', :path => '../riak-client'
+end
+
gemspec
platforms :mri do
Please sign in to comment.
Something went wrong with that request. Please try again.