aboutsummaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml11
1 files changed, 4 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml
index 5b8cfa9dbf..9d63fd4b13 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,14 +15,11 @@ services:
addons:
postgresql: "9.4"
- apt:
- packages:
- - postgresql-9.4
bundler_args: --without test --jobs 3 --retry 3
before_install:
- "rm ${BUNDLE_GEMFILE}.lock"
- - "gem update --system"
+ - "gem update --system 2.6.11"
- "gem update bundler"
- "[ -f /tmp/beanstalkd-1.10/Makefile ] || (curl -L https://github.com/kr/beanstalkd/archive/v1.10.tar.gz | tar xz -C /tmp)"
- "pushd /tmp/beanstalkd-1.10 && make && (./beanstalkd &); popd"
@@ -101,17 +98,17 @@ matrix:
- "GEM=ar:postgresql POSTGRES=9.2"
addons:
postgresql: "9.2"
- - rvm: jruby-9.1.8.0
+ - rvm: jruby-9.1.9.0
jdk: oraclejdk8
env:
- "GEM=ap"
- - rvm: jruby-9.1.8.0
+ - rvm: jruby-9.1.9.0
jdk: oraclejdk8
env:
- "GEM=am,amo,aj"
allow_failures:
- rvm: ruby-head
- - rvm: jruby-9.1.8.0
+ - rvm: jruby-9.1.9.0
- env: "GEM=ac:integration"
fast_finish: true