[ci] Oracle JDK 10 is deprecated, remove from CI matrix.

TestFX · Oct 21, 2018 · 8a405ea · 8a405ea
1 parent 116a098
commit 8a405ea
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 68 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -56,67 +56,37 @@ jobs:
       jdk: oraclejdk8
       env:
         - _JAVA_OPTIONS="-Djava.awt.headless=true -Dtestfx.robot=glass -Dtestfx.headless=true -Dprism.order=sw  -Dglass.gtk.uiScale=2.0"
-    # Ubuntu Linux (trusty) / Oracle JDK 10 / Headed (AWT Robot)
-    - os: linux
-      dist: trusty
-      jdk: oraclejdk10
-      env:
-        - _JAVA_OPTIONS="--add-opens=java.base/java.util=ALL-UNNAMED --add-exports=javafx.graphics/com.sun.glass.ui=ALL-UNNAMED -Dtestfx.robot=awt"
-    # Ubuntu Linux (trusty) / Oracle JDK 10 / Headed (Glass Robot)
-    - os: linux
-      dist: trusty
-      jdk: oraclejdk10
-      env:
-        - _JAVA_OPTIONS="--add-opens=java.base/java.util=ALL-UNNAMED --add-exports=javafx.graphics/com.sun.glass.ui=ALL-UNNAMED -Dtestfx.robot=glass"
-    # Ubuntu Linux (trusty) / Oracle JDK 10 / Headless
-    - os: linux
-      dist: trusty
-      jdk: oraclejdk10
-      env:
-        - _JAVA_OPTIONS="--add-opens=java.base/java.util=ALL-UNNAMED --add-exports=javafx.graphics/com.sun.glass.ui=ALL-UNNAMED -Djava.awt.headless=true -Dtestfx.robot=glass -Dtestfx.headless=true -Dprism.order=sw"
-    # Ubuntu Linux (trusty) / Oracle JDK 10 / Headed (AWT Robot) / HiDPI
-    - os: linux
-      dist: trusty
-      jdk: oraclejdk10
-      env:
-        - _JAVA_OPTIONS="--add-opens=java.base/java.util=ALL-UNNAMED --add-exports=javafx.graphics/com.sun.glass.ui=ALL-UNNAMED -Dtestfx.robot=awt -Djdk.gtk.verbose=true -Djdk.gtk.version=3 -Dglass.gtk.uiScale=2.0"
-    # Ubuntu Linux (trusty) / Oracle JDK 10 / Headed (Glass Robot) / HiDPI
-    - os: linux
-      dist: trusty
-      jdk: oraclejdk10
-      env:
-        - _JAVA_OPTIONS="--add-opens=java.base/java.util=ALL-UNNAMED --add-exports=javafx.graphics/com.sun.glass.ui=ALL-UNNAMED -Dtestfx.robot=glass -Djdk.gtk.verbose=true -Djdk.gtk.version=3 -Dglass.gtk.uiScale=2.0"
-    # Ubuntu Linux (trusty) / Oracle JDK 10 / Headless / HiDPI
+    # Ubuntu Linux (trusty) / Oracle JDK 11 / Headed (AWT Robot)
     - os: linux
       dist: trusty
-      jdk: oraclejdk10
+      jdk: oraclejdk11
       env:
-        - _JAVA_OPTIONS="--add-opens=java.base/java.util=ALL-UNNAMED --add-exports=javafx.graphics/com.sun.glass.ui=ALL-UNNAMED -Djava.awt.headless=true -Dtestfx.robot=glass -Dtestfx.headless=true -Dprism.order=sw -Dglass.gtk.uiScale=2.0"
-    # Ubuntu Linux (trusty) / Oracle JDK 11 / Headed (AWT Robot)
+        - _JAVA_OPTIONS="--add-opens=java.base/java.util=ALL-UNNAMED -Dtestfx.robot=awt"
+    # Ubuntu Linux (trusty) / Oracle JDK 11 / Headed (AWT Robot) / HiDPI
     - os: linux
       dist: trusty
       jdk: oraclejdk11
       env:
-        - _JAVA_OPTIONS="--add-opens=java.base/java.util=ALL-UNNAMED -Dtestfx.robot=glass"
+        - _JAVA_OPTIONS="--add-opens=java.base/java.util=ALL-UNNAMED -Dtestfx.robot=awt -Dglass.gtk.uiScale=2.0"
     # Ubuntu Linux (trusty) / Oracle JDK 11 / Headed (Glass Robot)
     - os: linux
       dist: trusty
       jdk: oraclejdk11
       env:
-        - _JAVA_OPTIONS="--add-opens=java.base/java.util=ALL-UNNAMED -Dtestfx.robot=awt"
+        - _JAVA_OPTIONS="--add-opens=java.base/java.util=ALL-UNNAMED -Dtestfx.robot=glass"
     # Ubuntu Linux (trusty) / Oracle JDK 11 / Headed (Glass Robot) / HiDPI
     - os: linux
       dist: trusty
       jdk: oraclejdk11
       env:
-        - _JAVA_OPTIONS="--add-opens=java.base/java.util=ALL-UNNAMED -Dtestfx.robot=glass -Djdk.gtk.verbose=true -Djdk.gtk.version=3 -Dglass.gtk.uiScale=2.0"
+        - _JAVA_OPTIONS="--add-opens=java.base/java.util=ALL-UNNAMED -Dtestfx.robot=glass -Dglass.gtk.uiScale=2.0"
     # Ubuntu Linux (trusty) / Oracle JDK 11 / Headless (Glass Robot)
     - os: linux
       dist: trusty
       jdk: oraclejdk11
       env:
         - _JAVA_OPTIONS="--add-opens=java.base/java.util=ALL-UNNAMED -Djava.awt.headless=true -Dtestfx.robot=glass -Dtestfx.headless=true -Dprism.order=sw"
-    # Ubuntu Linux (trusty) / Oracle JDK 11 / Headless / HiDPI
+    # Ubuntu Linux (trusty) / Oracle JDK 11 / Headless (Glass Robot) / HiDPI
     - os: linux
       dist: trusty
       jdk: oraclejdk11
@@ -128,13 +98,13 @@ jobs:
       jdk: oraclejdk8
       env:
         - _JAVA_OPTIONS="-Djava.awt.headless=true -Dtestfx.robot=glass -Dtestfx.headless=true -Dprism.order=sw -Dprism.verbose=true"
-    # macOS / Oracle JDK 10 / Headless
+    # macOS / OpenJDK 10 / Headless
     - os: osx
       osx_image: xcode9.4
       jdk: openjdk10
       env:
         - _JAVA_OPTIONS="-Djava.awt.headless=true -Dtestfx.robot=glass -Dtestfx.headless=true -Dprism.order=sw -Dprism.verbose=true"
-    # macOS / Open JDK 11 / Headless
+    # macOS / OpenJDK 11 / Headless
     - os: osx
       osx_image: xcode9.4
       jdk: openjdk11

diff --git a/appveyor.yml b/appveyor.yml
@@ -27,32 +27,7 @@ environment:
       _JAVA_OPTIONS: "-Djava.awt.headless=true -Dtestfx.robot=glass -Dtestfx.headless=true -Dprism.order=sw -Dprism.text=t2k"
       JAVA_HOME: C:\Program Files\Java\jdk1.8.0
 
-    # Java 10 / AWT Robot
-    - JAVA_VERSION: "10"
-      JAVA_HOME: C:\jdk10
-      _JAVA_OPTIONS: "-Dtestfx.robot=awt"
-
-    # Java 10 / Glass Robot (deadlock?)
-    # - JAVA_VERSION: "10"
-    #  JAVA_HOME: C:\jdk10
-    #  _JAVA_OPTIONS: "-Dtestfx.robot=glass"
-
-    # Java 10 / Glass Robot / HiDPI (deadlock?)
-    # - JAVA_VERSION: "10"
-    #  JAVA_HOME: C:\jdk10
-    #  _JAVA_OPTIONS: "-Dprism.verbose=true -Dtestfx.robot=glass -Dglass.win.uiScale=200%"
-
-    # Java 10 / AWT Robot / HiDPI
-    - JAVA_VERSION: "10"
-      JAVA_HOME: C:\jdk10
-      _JAVA_OPTIONS: "-Dtestfx.robot=awt -Dtestfx.awt.scale=true -Dglass.win.uiScale=200%"
-
-    # Java 10 / Headless (fails because of JDK-8201539)
-    - JAVA_VERSION: "10"
-      JAVA_HOME: C:\jdk10
-      _JAVA_OPTIONS: "-Djava.awt.headless=true -Dtestfx.robot=glass -Dtestfx.headless=true -Dprism.order=sw"
-
-    # Java 10 / AWT Robot
+    # Java 11 / AWT Robot
     - JAVA_VERSION: "11"
       JAVA_HOME: C:\jdk11
       _JAVA_OPTIONS: "-Dtestfx.robot=awt"
@@ -74,8 +49,6 @@ environment:
 
 matrix:
   allow_failures:
-    - JAVA_VERSION: "10"
-      _JAVA_OPTIONS: "-Djava.awt.headless=true -Dtestfx.robot=glass -Dtestfx.headless=true -Dprism.order=sw"
     - JAVA_VERSION: "11"
       _JAVA_OPTIONS: "-Djava.awt.headless=true -Dtestfx.robot=glass -Dtestfx.headless=true -Dprism.order=sw"