From 5601a65fdc33b0fa54f6f695cfd7c0e9a6f91ed4 Mon Sep 17 00:00:00 2001 From: Olle Jonsson Date: Tue, 7 Feb 2017 09:59:14 +0100 Subject: [PATCH] Travis: Build on Trusty, exact JRuby versions (#35) --- .travis.yml | 13 +++++++++---- Gemfile | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index ad43dc4..b6e7f3b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,15 @@ +dist: trusty +language: ruby +env: + global: + - JRUBY_OPTS=--debug rvm: - jruby-18mode - - jruby-19mode + - jruby-1.7.26 + - jruby-9.1.7.0 - jruby-head -#env: -# - JRUBY_OPTS="--1.8" -# - JRUBY_OPTS="--1.9" +before_install: + - gem update --system branches: only: - master diff --git a/Gemfile b/Gemfile index fd9e1fa..7b5520c 100644 --- a/Gemfile +++ b/Gemfile @@ -17,5 +17,5 @@ group :test do gem 'less', '>= 2.2.1', :require => nil end -gem 'rake', :require => false, :group => :development +gem 'rake', '< 11.0', :require => false, :group => :development gem 'jruby-openssl', :group => :development if JRUBY_VERSION < '1.7'