From 743acd05a0b657b9f20f1e9a72dd5cd05428856c Mon Sep 17 00:00:00 2001
From: James Chen <james@ashchan.com>
Date: Sat, 25 May 2019 21:50:09 +0900
Subject: [PATCH 1/6] chore(ci): Add Node 12

---
 .travis.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e48455ed60..f2fe2226c3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,12 +2,13 @@ os:
   - linux
   - osx
 
-osx_image: xcode10.1
+osx_image: xcode10.2
 
 language: node_js
 
 node_js:
-  - '11.10'
+  - '11'
+  - '12'
 
 cache:
   - npm

From c4ce630d72964181cf0a35b829da7cce7ff82031 Mon Sep 17 00:00:00 2001
From: James Chen <james@ashchan.com>
Date: Sat, 25 May 2019 22:30:03 +0900
Subject: [PATCH 2/6] chore(ci): Setup travis to run Ubuntu 16.04

---
 .travis.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f2fe2226c3..9cbd74d191 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,9 @@
-os:
-  - linux
-  - osx
-
-osx_image: xcode10.2
+matrix:
+  include:
+    - os: linux
+      dist: xenial
+    - os: osx
+      osx_image: xcode10.2
 
 language: node_js
 

From df64e9c305e5e449a72b7fe0cbc7b49808ec6005 Mon Sep 17 00:00:00 2001
From: James Chen <james@ashchan.com>
Date: Sat, 25 May 2019 22:39:31 +0900
Subject: [PATCH 3/6] chore(ci): Add xvfb package for Ubuntu

---
 .travis.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 9cbd74d191..87342f9825 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,11 @@ matrix:
     - os: osx
       osx_image: xcode10.2
 
+addons:
+   apt:
+     packages:
+       - xvfb
+
 language: node_js
 
 node_js:

From 2893cf1d4039a7e3152d617556a4ab492e8a6624 Mon Sep 17 00:00:00 2001
From: James Chen <james@ashchan.com>
Date: Sat, 25 May 2019 23:01:36 +0900
Subject: [PATCH 4/6] chore(ci): Configure xenial to use xvfb service

---
 .travis.yml | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 87342f9825..d494faba15 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,14 @@
 matrix:
   include:
-    - os: linux
+    - name: Test on Linux
+      os: linux
       dist: xenial
-    - os: osx
+    - name: Test on macOS
+      os: osx
       osx_image: xcode10.2
 
-addons:
-   apt:
-     packages:
-       - xvfb
+services:
+  - xvfb
 
 language: node_js
 
@@ -28,11 +28,6 @@ install:
   - travis_retry yarn install
   - travis_retry yarn lerna bootstrap
 
-before_script:
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export DISPLAY=:99.0; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sh -e /etc/init.d/xvfb start; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sleep 3; fi
-
 script:
   - git diff --exit-code yarn.lock
   - CI=false yarn build

From 7bd90cdcba638146e734483348b79518b7d47898 Mon Sep 17 00:00:00 2001
From: James Chen <james@ashchan.com>
Date: Sat, 25 May 2019 23:23:24 +0900
Subject: [PATCH 5/6] chore(ci): Try moving node_js section into matrix

---
 .travis.yml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d494faba15..b2814bde80 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,21 +1,23 @@
+language: node_js
+
 matrix:
   include:
     - name: Test on Linux
       os: linux
       dist: xenial
+      node_js:
+        - '11'
+        - '12'
     - name: Test on macOS
       os: osx
       osx_image: xcode10.2
+      node_js:
+        - '11'
+        - '12'
 
 services:
   - xvfb
 
-language: node_js
-
-node_js:
-  - '11'
-  - '12'
-
 cache:
   - npm
   - yarn

From 1f7871fd9096115370281d6310148cf5ecd69147 Mon Sep 17 00:00:00 2001
From: James Chen <james@ashchan.com>
Date: Sat, 25 May 2019 23:36:17 +0900
Subject: [PATCH 6/6] chore(ci): Remove matrix

---
 .travis.yml | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b2814bde80..440eaf7ce7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,23 +1,19 @@
 language: node_js
 
-matrix:
-  include:
-    - name: Test on Linux
-      os: linux
-      dist: xenial
-      node_js:
-        - '11'
-        - '12'
-    - name: Test on macOS
-      os: osx
-      osx_image: xcode10.2
-      node_js:
-        - '11'
-        - '12'
+os:
+  - linux
+  - osx
+
+dist: xenial
+osx_image: xcode10.2
 
 services:
   - xvfb
 
+node_js:
+  - '11'
+  - '12'
+
 cache:
   - npm
   - yarn