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

Configure spec UI to run in docker container

Browse source
This commit is contained in:
Kevin Sawicki 2017-07-21 13:28:02 -07:00 • committed by Aleksei Kuzmin
parent 5737f8b74e
commit 29dc06c89d
3 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
script/cibuild
View file

@ -62,9 +62,9 @@ def main():
execute(['sh', '-e', '/etc/init.d/xvfb', 'start']) execute(['sh', '-e', '/etc/init.d/xvfb', 'start'])
if PLATFORM == 'linux':
os.environ['DISPLAY'] = ':99.0' 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'
execute([npm, 'install', 'npm@2.12.1']) execute([npm, 'install', 'npm@2.12.1'])

4
script/cibuild-linux
View file

@ -34,7 +34,11 @@ 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 /dev/shm:/dev/shm \
--workdir /workspace/electron \ --workdir /workspace/electron \
--privileged \
libchromiumcontent-linux script/cibuild libchromiumcontent-linux script/cibuild

3
spec/api-browser-window-spec.js
View file

@ -1825,6 +1825,9 @@ describe('BrowserWindow module', function () {
// This test is too slow, only test it on CI. // This test is too slow, only test it on CI.
if (!isCI) return if (!isCI) return
// FIXME These specs crash on Linux when run in a docker container
if (isCI && process.platform === 'linux') return
it('subscribes to frame updates', function (done) { it('subscribes to frame updates', function (done) {
let called = false let called = false
w.loadURL('file://' + fixtures + '/api/frame-subscriber.html') w.loadURL('file://' + fixtures + '/api/frame-subscriber.html')