Restructure and rename gemfiles, exclude activesupport-5x from jRuby

PlumLabs · Aug 20, 2016 · 9e40363 · 9e40363
1 parent 4a39041
commit 9e40363
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,5 +8,12 @@ rvm:
 
 gemfile:
   - Gemfile
-  - Gemfile_activesupport_4
-  - Gemfile_activesupport_5
+  - gemfiles/Gemfile.activesupport-4
+  - gemfiles/Gemfile.activesupport-5
+
+matrix:
+  allow_failures:
+  - rvm: jruby
+    gemfile: Gemfile
+  - rvm: jruby
+    gemfile: gemfile/Gemfile.activesupport-5
diff --git a/Gemfile_activesupport_4 → gemfiles/Gemfile.activesupport-4 b/Gemfile_activesupport_4 → gemfiles/Gemfile.activesupport-4
diff --git a/Gemfile_activesupport_5 → gemfiles/Gemfile.activesupport-5 b/Gemfile_activesupport_5 → gemfiles/Gemfile.activesupport-5