Try speeding up travis by only running one JDK, one platform.

jruby · Dec 12, 2014 · 8ddeaaf · 8ddeaaf
1 parent 4f5c5a6
commit 8ddeaaf
Showing 1 changed file with 9 additions and 26 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,13 +5,10 @@ before_script:
   - "export JAVA_OPTS='-XX:+TieredCompilation -XX:TieredStopAtLevel=1'"
   - echo $HOME
 
-jdk:
-  - openjdk7
-  - oraclejdk8
+jdk: openjdk7
 
 os:
   - linux
-  - osx
 
 env:
   global:
@@ -32,30 +29,16 @@ env:
     - PHASE='-Prake -Dtask=spec:profiler'
     - PHASE='-Ptruffle-specs-language'
     - PHASE='-Ptruffle-specs-core'
+    - PHASE='-Pmain'
+    - PHASE='-Pcomplete'
+    - PHASE='-Posgi'
+    - PHASE='-Pj2ee'
+    - PHASE='-Pjruby-jars,test -Dinvoker.test=extended'
+    - PHASE='-Pmain,test -Dinvoker.test=extended'
+    - PHASE='-Pjruby_complete_jar_extended -Dinvoker.skip=true'
+    - COMMAND=test/check_versions.sh
 
 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: oraclejdk7
-    - env: PHASE='-Pcomplete'
-      jdk: oraclejdk8
-    - env: PHASE='-Posgi'
-      jdk: openjdk7
-    - env: PHASE='-Pj2ee'
-      jdk: oraclejdk7
-    - env: PHASE='-Pjruby-jars,test -Dinvoker.test=extended'
-      jdk: oraclejdk7
-    - env: PHASE='-Pmain,test -Dinvoker.test=extended'
-      jdk: openjdk7
-    - env: PHASE='-Pjruby_complete_jar_extended -Dinvoker.skip=true'
-      jdk: oraclejdk8
-    - env: COMMAND=test/check_versions.sh
-      jdk: oraclejdk8
   fast_finish: true
   allow_failures:
     - env: PHASE='-Pcomplete'