From 58dd563760846ff113da1a147fabc08caca11c37 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Wed, 6 Dec 2017 14:57:16 +0000 Subject: [PATCH 1/3] [CI] Oracle JDK 7 is very long dead --- .travis.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 05e77b6..0db9bbd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,20 +12,14 @@ matrix: - rvm: ruby-head - rvm: jruby-1.7 jdk: openjdk7 - - rvm: jruby-1.7 - jdk: oraclejdk7 - rvm: jruby-1.7 jdk: oraclejdk8 - rvm: jruby-head jdk: openjdk7 - - rvm: jruby-head - jdk: oraclejdk7 - rvm: jruby-head jdk: oraclejdk8 - rvm: jruby-9.0.4.0 jdk: openjdk7 - - rvm: jruby-9.0.4.0 - jdk: oraclejdk7 - rvm: jruby-9.0.4.0 jdk: oraclejdk8 allow_failures: From 970e6cdcd0e9c2f12e7ae23d3fe5f9858d527de9 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Wed, 6 Dec 2017 16:29:59 +0000 Subject: [PATCH 2/3] [CI] Bump JRuby version to 9.1.13.0 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0db9bbd..387d753 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,9 +18,9 @@ matrix: jdk: openjdk7 - rvm: jruby-head jdk: oraclejdk8 - - rvm: jruby-9.0.4.0 + - rvm: jruby-9.1.13.0 jdk: openjdk7 - - rvm: jruby-9.0.4.0 + - rvm: jruby-9.1.13.0 jdk: oraclejdk8 allow_failures: - rvm: rbx-2 From 46278794fe83af7a38f040ac5df31b03d9c3d55e Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Wed, 6 Dec 2017 16:30:15 +0000 Subject: [PATCH 3/3] [CI] Set JRUBY_OPTS with env instead of before_script The latter seems ineffective. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 387d753..768a48b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,7 +34,7 @@ addons: - libpcre3-dev before_install: - gem install bundler -before_script: export JRUBY_OPTS="--server --debug -J-Xss1024k -J-Xmx652m -J-XX:+UseConcMarkSweepGC" +env: JRUBY_OPTS="--server --debug -J-Xss1024k -J-Xmx652m -J-XX:+UseConcMarkSweepGC" notifications: irc: "irc.freenode.org#adhearsion"