Merge pull request #855 from nanoc/jruby-on-travis

Run JRuby on Travis CI
nanoc · May 20, 2016 · d696b50 · d696b50
2 parents e6712a0 + f832a9e
commit d696b50
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,13 +10,15 @@ branches:
 before_install: gem install bundler
 matrix:
   include:
-    - rvm: jruby-head
-      jdk: openjdk7
+    - rvm: jruby-9.0.5.0
       env: DISABLE_NOKOGIRI=1
+    - rvm: jruby-9.0.5.0
+      env: DISABLE_NOKOGIRI=0
   allow_failures:
-    - rvm: jruby-head
-      jdk: openjdk7
+    - rvm: jruby-9.0.5.0
       env: DISABLE_NOKOGIRI=1
+    - rvm: jruby-9.0.5.0
+      env: DISABLE_NOKOGIRI=0
     - rvm: ruby-head
 notifications:
   irc:

diff --git a/Gemfile b/Gemfile
@@ -43,7 +43,7 @@ group :plugins do
   gem 'rainpress'
   gem 'rdiscount', '~> 2.2', platforms: [:ruby, :mswin]
   gem 'redcarpet', platforms: [:ruby, :mswin]
-  gem 'RedCloth'
+  gem 'RedCloth', platforms: :ruby
   gem 'rouge'
   gem 'rubypants'
   gem 'sass'