From a0fd37c8a3003214c2e57947174e92c9608cf0a0 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Fri, 21 Jul 2017 13:54:45 -0700
Subject: [PATCH]  Try always using DISPLAY=unix:99:0 on Linux CI

---
 script/cibuild       | 3 ---
 script/cibuild-linux | 1 +
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/script/cibuild b/script/cibuild
index 31b69005224f..53a1859df65b 100755
--- a/script/cibuild
+++ b/script/cibuild
@@ -61,9 +61,6 @@ def main():
     execute(['sudo', 'apt-get', 'install'] + deps)
 
     execute(['sh', '-e', '/etc/init.d/xvfb', 'start'])
-
-
-  if PLATFORM == 'linux':
     os.environ['DISPLAY'] = ':99.0'
 
   # CI's npm is not reliable.
diff --git a/script/cibuild-linux b/script/cibuild-linux
index 395c0b01d296..916ea4e81e33 100755
--- a/script/cibuild-linux
+++ b/script/cibuild-linux
@@ -36,6 +36,7 @@ docker run \
   --env ELECTRON_S3_BUCKET="$BUILD_ELECTRON_ELECTRON_S3_BUCKET" \
   --env ELECTRON_S3_ACCESS_KEY="$BUILD_ELECTRON_ELECTRON_S3_ACCESS_KEY" \
   --env ELECTRON_S3_SECRET_KEY="$BUILD_ELECTRON_ELECTRON_S3_SECRET_KEY" \
+  --env DISPLAY="unix:99:0" \
   --user "$UID" \
   --volume "$PWD":/workspace/electron \
   --volume /tmp/.X11-unix:/tmp/.X11-unix  \