From 23b35af7f2c73cb8489527bf2842b95dca93a62d Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Fri, 21 Jul 2017 13:52:26 -0700 Subject: [PATCH] Use DISPLAY=:99.0 on Linux CI --- script/cibuild | 3 ++- script/cibuild-linux | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/script/cibuild b/script/cibuild index 452da6d7f74..31b69005224 100755 --- a/script/cibuild +++ b/script/cibuild @@ -62,8 +62,9 @@ def main(): execute(['sh', '-e', '/etc/init.d/xvfb', 'start']) - os.environ['DISPLAY'] = ':99.0' + if PLATFORM == 'linux': + os.environ['DISPLAY'] = ':99.0' # CI's npm is not reliable. npm = 'npm.cmd' if PLATFORM == 'win32' else 'npm' diff --git a/script/cibuild-linux b/script/cibuild-linux index a5dadba5200..395c0b01d29 100755 --- a/script/cibuild-linux +++ b/script/cibuild-linux @@ -36,7 +36,6 @@ 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$DISPLAY" \ --user "$UID" \ --volume "$PWD":/workspace/electron \ --volume /tmp/.X11-unix:/tmp/.X11-unix \