Reverse accidental changes to .travis.yml when merging.

jruby · Feb 2, 2016 · 5dd84f5 · 5dd84f5
1 parent 51ef78b
commit 5dd84f5
Showing 1 changed file with 46 additions and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -22,8 +22,26 @@ os:
 
 env:
   global:
+    - JAVA_OPTS="-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
     - MALLOC_ARENA_MAX=2
   matrix:
+    - PHASE='-Ptest'
+    - PHASE='-Prake -Dtask=test:jruby'
+    - PHASE='-Prake -Dtask=test:jruby:fullint'
+    - PHASE='-Prake -Dtask=test:jruby:jit'
+    - PHASE='-Prake -Dtask=test:mri'
+    - PHASE='-Prake -Dtask=test:mri:fullint'
+    - PHASE='-Prake -Dtask=test:mri:jit'
+    - PHASE='-Prake -Dtask=test:slow_suites'
+    - PHASE='-Prake -Dtask=test:tracing'
+    - PHASE='-Prake -Dtask=spec:ji'
+    - PHASE='-Prake -Dtask=spec:compiler'
+    - PHASE='-Prake -Dtask=spec:ffi'
+    - PHASE='-Prake -Dtask=spec:regression'
+    - PHASE='-Prake -Dtask=spec:ruby:fast'
+    - PHASE='-Prake -Dtask=spec:jruby'
+    - PHASE='-Prake -Dtask=spec:jrubyc'
+    - PHASE='-Prake -Dtask=spec:profiler'
     - JT='test specs :language'
     - JT='test specs :core'
     - JT='test specs :library'
@@ -33,10 +51,38 @@ env:
 
 matrix:
   include:
+    # these profile do no need to run for all JDKs
+    - env: PHASE='-Pdist'
+      jdk: oraclejdk8
+    - env: PHASE='-Pjruby-jars'
+      jdk: openjdk7
+    - env: PHASE='-Pmain'
+      jdk: oraclejdk8
+    - env: PHASE='-Pcomplete'
+      jdk: oraclejdk8
+    - env: PHASE='-Posgi'
+      jdk: openjdk7
+    - env: PHASE='-Pj2ee'
+      jdk: oraclejdk7
+    # These next two started crashing on JDK7 in March 2015, possibly due to JVM issues on Travis's Docker-based env
+    - env: PHASE='-Pjruby-jars,test -Dinvoker.test=extended'
+      jdk: oraclejdk8
+    - env: PHASE='-Pmain,test -Dinvoker.test=extended'
+      jdk: oraclejdk8
+    - env: PHASE='-Pjruby_complete_jar_extended -Dinvoker.skip=true'
+      jdk: oraclejdk8
     - env: COMMAND=test/check_versions.sh
       jdk: oraclejdk8
     - env: JT=check_ambiguous_arguments
       jdk: oraclejdk8
+  allow_failures:
+    - env: PHASE='-Prake -Dtask=test:mri:fullint'
+    # NOTE: build seems to never start (waited for any to finish for more than a day) - probably a travis-ci bug
+    #- env: PHASE='-Pmain'
+    #  sudo: required
+    #  dist: trusty
+    #  group: edge
+    #  jdk: oraclejdk9
 
 branches:
   only: