mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Use DISPLAY=:99.0 on Linux CI

Browse source
This commit is contained in:
Kevin Sawicki 2017-07-21 13:52:26 -07:00 • committed by Aleksei Kuzmin
parent ddefc08ec5
commit 23b35af7f2
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
script/cibuild
View file

@ -62,8 +62,9 @@ def main():
execute(['sh', '-e', '/etc/init.d/xvfb', 'start']) 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. # CI's npm is not reliable.
npm = 'npm.cmd' if PLATFORM == 'win32' else 'npm' npm = 'npm.cmd' if PLATFORM == 'win32' else 'npm'

1
script/cibuild-linux
View file

@ -36,7 +36,6 @@ docker run \
--env ELECTRON_S3_BUCKET="$BUILD_ELECTRON_ELECTRON_S3_BUCKET" \ --env ELECTRON_S3_BUCKET="$BUILD_ELECTRON_ELECTRON_S3_BUCKET" \
--env ELECTRON_S3_ACCESS_KEY="$BUILD_ELECTRON_ELECTRON_S3_ACCESS_KEY" \ --env ELECTRON_S3_ACCESS_KEY="$BUILD_ELECTRON_ELECTRON_S3_ACCESS_KEY" \
--env ELECTRON_S3_SECRET_KEY="$BUILD_ELECTRON_ELECTRON_S3_SECRET_KEY" \ --env ELECTRON_S3_SECRET_KEY="$BUILD_ELECTRON_ELECTRON_S3_SECRET_KEY" \
--env DISPLAY="unix$DISPLAY" \
--user "$UID" \ --user "$UID" \
--volume "$PWD":/workspace/electron \ --volume "$PWD":/workspace/electron \
--volume /tmp/.X11-unix:/tmp/.X11-unix \ --volume /tmp/.X11-unix:/tmp/.X11-unix \