From d4217ccce64b41bed0efca3c2788189144eb187e Mon Sep 17 00:00:00 2001 From: Jesse Wolgamott Date: Mon, 23 Jan 2017 10:50:58 -0600 Subject: [PATCH 1/4] Possibly fix travis-ci --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3073f79..f0ca121 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,4 @@ language: ruby rvm: - - jruby-19mode # JRuby in 1.9 mode + - jruby +sudo: false From 9f30b5e123e93a21dab46d99c45fe3f37e2df82e Mon Sep 17 00:00:00 2001 From: Jesse Wolgamott Date: Mon, 23 Jan 2017 12:33:57 -0600 Subject: [PATCH 2/4] move to jruby-head --- .travis.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f0ca121..fd0d64a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,9 @@ language: ruby rvm: - - jruby + - jruby-head sudo: false +before_install: + - gem install bundler +cache: bundler +sudo: false + From 0a60d88517e2ed2415ba7f70c461a7b61b17fce7 Mon Sep 17 00:00:00 2001 From: Jesse Wolgamott Date: Mon, 23 Jan 2017 12:38:47 -0600 Subject: [PATCH 3/4] move to ruby 2.3.1 --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 614b5f2..0e4f849 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source "https://rubygems.org" -ruby "2.0.0", :engine => "jruby", :engine_version => "1.7.11" +ruby "2.3.1", :engine => "jruby", :engine_version => "1.7.11" gem "rake", "~> 0.9.2" gem "sinatra" From 34c49c3d6a7e6bd41320d47bd0ffc0e2a93f7df4 Mon Sep 17 00:00:00 2001 From: Jesse Wolgamott Date: Mon, 23 Jan 2017 12:44:04 -0600 Subject: [PATCH 4/4] Specify ruby version --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 0e4f849..cc5ef21 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source "https://rubygems.org" -ruby "2.3.1", :engine => "jruby", :engine_version => "1.7.11" +ruby "2.3.1", :engine => "jruby", :engine_version => "9.1.8.0-SNAPSHOT" gem "rake", "~> 0.9.2" gem "sinatra"