From 2bd44612fda6d07e3430763a87d9efbcbae5fa5d Mon Sep 17 00:00:00 2001 From: Aleksei Kuzmin Date: Thu, 2 Nov 2017 03:22:27 +0300 Subject: [PATCH 1/2] Revert "Merge pull request #10989 from electron/temporary-disable-visibility-state-tests" This reverts commit f3125358c0d7efd20a4d41f4578bd023c2bb4bde, reversing changes made to 7b9ad5001bf713daca9f92db0091a18b78eb2d76. --- spec/api-browser-window-spec.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/spec/api-browser-window-spec.js b/spec/api-browser-window-spec.js index 4955203634cf..185b8fba8204 100644 --- a/spec/api-browser-window-spec.js +++ b/spec/api-browser-window-spec.js @@ -1528,9 +1528,7 @@ describe('BrowserWindow module', () => { }) }) - // FIXME(alexeykuzmin): Temporary disabled to unblock master. - // https://github.com/electron/electron/issues/10988 - xdescribe('document.visibilityState/hidden', () => { + describe('document.visibilityState/hidden', () => { beforeEach(() => { w.destroy() }) function onVisibilityChange (callback) { From a34255ceef07941f3be7dbf4e8298f4a4085c1d4 Mon Sep 17 00:00:00 2001 From: John Kleinschmidt Date: Tue, 7 Nov 2017 16:32:09 -0500 Subject: [PATCH 2/2] Add Jenkinsfile to enable rebuilds Adding this file will allow us to rerun builds in Jenkins. --- Jenkinsfile | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 000000000000..51ad1b492dcb --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,44 @@ +pipeline { + agent none + stages { + stage('Build') { + parallel { + stage('electron-osx-x64') { + agent { + label 'osx' + } + steps { + sh 'script/bootstrap.py --target_arch=x64 --dev' + sh 'npm run lint' + sh 'script/build.py -c D' + sh 'script/test.py --ci --rebuild_native_modules' + } + post { + always { + cleanWs() + } + } + } + stage('electron-mas-x64') { + agent { + label 'osx' + } + environment { + MAS_BUILD = '1' + } + steps { + sh 'script/bootstrap.py --target_arch=x64 --dev' + sh 'npm run lint' + sh 'script/build.py -c D' + sh 'script/test.py --ci --rebuild_native_modules' + } + post { + always { + cleanWs() + } + } + } + } + } + } +}