From d7bcf5151358877e18fc2d2c86936b3407857a35 Mon Sep 17 00:00:00 2001 From: Ralf Kistner Date: Wed, 20 Dec 2017 15:19:22 +0200 Subject: [PATCH 1/5] Increase timeout for parallel test. --- test/parallel_insert.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/parallel_insert.test.js b/test/parallel_insert.test.js index fc3829bc..7e0ab0b9 100644 --- a/test/parallel_insert.test.js +++ b/test/parallel_insert.test.js @@ -28,7 +28,7 @@ describe('parallel', function() { } db.wait(done); - }); + }).timeout(10000); it('should close the database', function(done) { db.close(done); From 9e8db867a3195e3676a3aa9566e8337a54ba6eff Mon Sep 17 00:00:00 2001 From: Ralf Kistner Date: Wed, 20 Dec 2017 15:26:56 +0200 Subject: [PATCH 2/5] Update AppVeyor config. --- appveyor.yml | 57 ---------------------------------------------------- 1 file changed, 57 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 62f55c9a..32ea20d3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,68 +1,11 @@ environment: - node_pre_gyp_accessKeyId: - secure: 7DrSVc5eIGtmMcki5H+iRft+Tk3MJTwDBQEUuJHWaQ4= - node_pre_gyp_secretAccessKey: - secure: 1amwJJw9fu0j6dXnc5KsAQbSYf7Cjw/dapT6OZWABa6nc52grkKeLQ+DGaOfQz8i matrix: - - nodejs_version: 0.10 - platform: x86 - msvs_toolset: 12 - - nodejs_version: 0.10 - platform: x64 - msvs_toolset: 12 - - nodejs_version: 0.12 - platform: x86 - msvs_toolset: 12 - - nodejs_version: 0.12 - platform: x64 - msvs_toolset: 12 - - nodejs_version: 4 - platform: x64 - msvs_toolset: 12 - - nodejs_version: 4 - platform: x86 - msvs_toolset: 12 - - nodejs_version: 5 - platform: x64 - msvs_toolset: 12 - - nodejs_version: 5 - platform: x86 - msvs_toolset: 12 - - nodejs_version: 6 - platform: x64 - msvs_toolset: 12 - - nodejs_version: 6 - platform: x86 - msvs_toolset: 12 - - nodejs_version: 7 - platform: x64 - msvs_toolset: 12 - - nodejs_version: 7 - platform: x86 - msvs_toolset: 12 - nodejs_version: 8 platform: x64 msvs_toolset: 12 - nodejs_version: 8 platform: x86 msvs_toolset: 12 - # custom visual studio 2015 builds - - nodejs_version: 0.10.40 - platform: x86 - msvs_toolset: 14 - TOOLSET_ARGS: --dist-url=https://s3.amazonaws.com/mapbox/node-cpp11 --toolset=v140 - - nodejs_version: 0.10.40 - platform: x64 - msvs_toolset: 14 - TOOLSET_ARGS: --dist-url=https://s3.amazonaws.com/mapbox/node-cpp11 --toolset=v140 - - nodejs_version: 0.12.7 - platform: x86 - msvs_toolset: 14 - TOOLSET_ARGS: --dist-url=https://s3.amazonaws.com/mapbox/node-cpp11 --toolset=v140 - - nodejs_version: 0.12.7 - platform: x64 - msvs_toolset: 14 - TOOLSET_ARGS: --dist-url=https://s3.amazonaws.com/mapbox/node-cpp11 --toolset=v140 os: Visual Studio 2015 From e2bedfcee6ea54c207a48a38133dd77eb635d32b Mon Sep 17 00:00:00 2001 From: Ralf Kistner Date: Wed, 20 Dec 2017 15:33:24 +0200 Subject: [PATCH 3/5] Test electron build on AppVeyor. --- scripts/build-appveyor.bat | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/scripts/build-appveyor.bat b/scripts/build-appveyor.bat index 47f2f53d..5bd5293b 100644 --- a/scripts/build-appveyor.bat +++ b/scripts/build-appveyor.bat @@ -151,6 +151,14 @@ ECHO calling npm test CALL npm test IF %ERRORLEVEL% NEQ 0 GOTO ERROR +ECHO calling electron-rebuild +CALL .\node_modules\.bin\electron-rebuild --force +IF %ERRORLEVEL% NEQ 0 GOTO ERROR + +ECHO calling electron-mocha +CALL .\node_modules\.bin\electron-mocha +IF %ERRORLEVEL% NEQ 0 GOTO ERROR + :NPM_TEST_FINISHED From 5e0c7e64ab51a84451bb695e2064054eed75b66a Mon Sep 17 00:00:00 2001 From: Ralf Kistner Date: Wed, 20 Dec 2017 15:38:48 +0200 Subject: [PATCH 4/5] Increase timeout again. --- test/parallel_insert.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/parallel_insert.test.js b/test/parallel_insert.test.js index 7e0ab0b9..ae7a7a47 100644 --- a/test/parallel_insert.test.js +++ b/test/parallel_insert.test.js @@ -28,7 +28,7 @@ describe('parallel', function() { } db.wait(done); - }).timeout(10000); + }).timeout(30000); it('should close the database', function(done) { db.close(done); From c6f93eaa9e29e835e70d1d910bd0a13037588d6e Mon Sep 17 00:00:00 2001 From: Ralf Kistner Date: Wed, 20 Dec 2017 15:41:47 +0200 Subject: [PATCH 5/5] Use msvs_toolset 14. --- appveyor.yml | 4 ++-- scripts/build-appveyor.bat | 29 ----------------------------- 2 files changed, 2 insertions(+), 31 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 32ea20d3..c59bdb5e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,10 +2,10 @@ environment: matrix: - nodejs_version: 8 platform: x64 - msvs_toolset: 12 + msvs_toolset: 14 - nodejs_version: 8 platform: x86 - msvs_toolset: 12 + msvs_toolset: 14 os: Visual Studio 2015 diff --git a/scripts/build-appveyor.bat b/scripts/build-appveyor.bat index 5bd5293b..a907f519 100644 --- a/scripts/build-appveyor.bat +++ b/scripts/build-appveyor.bat @@ -50,35 +50,6 @@ powershell Set-ExecutionPolicy Unrestricted -Scope CurrentUser -Force IF %ERRORLEVEL% NEQ 0 GOTO ERROR :SKIP_APPVEYOR_INSTALL -IF /I "%msvs_toolset%"=="12" GOTO NODE_INSTALLED - - -::custom node for VS2015 -SET ARCHPATH= -IF "%platform%"=="X64" (SET ARCHPATH=x64/) -IF "%platform%"=="x64" (SET ARCHPATH=x64/) -SET NODE_URL=https://mapbox.s3.amazonaws.com/node-cpp11/v%nodejs_version%/%ARCHPATH%node.exe -ECHO downloading node^: %NODE_URL% -powershell Invoke-WebRequest "${env:NODE_URL}" -OutFile node.exe -IF %ERRORLEVEL% NEQ 0 GOTO ERROR - -ECHO deleting node ... -SET NODE_EXE_PRG=%ProgramFiles%\nodejs\node.exe -IF EXIST "%NODE_EXE_PRG%" ECHO found %NODE_EXE_PRG%, deleting... && DEL /F "%NODE_EXE_PRG%" -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -IF EXIST "%ProgramFiles%\nodejs" ECHO copy custom node.exe to %ProgramFiles%\nodejs\ && COPY node.exe "%ProgramFiles%\nodejs\" -IF %ERRORLEVEL% NEQ 0 GOTO ERROR - -SET NODE_EXE_PRG=%ProgramFiles(x86)%\nodejs\node.exe -IF EXIST "%NODE_EXE_PRG%" ECHO found %NODE_EXE_PRG%, deleting... && DEL /F "%NODE_EXE_PRG%" -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -IF EXIST "%ProgramFiles(x86)%\nodejs" ECHO copy custom node.exe to %ProgramFiles(x86)%\nodejs\ && COPY node.exe "%ProgramFiles(x86)%\nodejs\" -IF %ERRORLEVEL% NEQ 0 GOTO ERROR - -ECHO delete node.exe in current directory && DEL node.exe -IF %ERRORLEVEL% NEQ 0 GOTO ERROR - -:NODE_INSTALLED ECHO available node.exe^: call where node