Fix electron artifact builds

8 years ago · b19ac96487
parent e8b1fd0cba
commit b19ac96487
4 changed files with 5 additions and 5 deletions
--- a/binding.gyp
+++ b/binding.gyp
@ -54,7 +54,7 @@
          'GRPC_UV'
        ]
      }],
-      ['runtime=="electron"', {
+      ['OS!="win" && runtime=="electron"', {
        "defines": [
          'OPENSSL_NO_THREADS'
        ]
--- a/templates/binding.gyp.template
+++ b/templates/binding.gyp.template
@ -56,7 +56,7 @@
            'GRPC_UV'
          ]
        }],
-        ['runtime=="electron"', {
+        ['OS!="win" && runtime=="electron"', {
          "defines": [
            'OPENSSL_NO_THREADS'
          ]
--- a/tools/run_tests/artifacts/build_artifact_node.bat
+++ b/tools/run_tests/artifacts/build_artifact_node.bat
@ -51,7 +51,7 @@ for %%v in (%node_versions%) do (
 )

 for %%v in (%electron_versions%) do (
-  call .\node_modules\.bin\node-pre-gyp.cmd configure rebuild package testpackage --runtime=electron --target=%%v --target_arch=%1 || goto :error
+  cmd /V /C "set "HOME=%HOMEDRIVE%%HOMEPATH%\electron-gyp" && call .\node_modules\.bin\node-pre-gyp.cmd configure rebuild package testpackage --runtime=electron --target=%%v --target_arch=%1 --disturl=https://atom.io/download/electron" || goto :error

  xcopy /Y /I /S build\stage\* artifacts\ || goto :error
 )
--- a/tools/run_tests/artifacts/build_artifact_node.sh
+++ b/tools/run_tests/artifacts/build_artifact_node.sh
@ -52,8 +52,8 @@ do
  cp -r build/stage/* artifacts/
 done

-for version in ${node_versions[@]}
+for version in ${electron_versions[@]}
 do
-  HOME=~/.electron-gyp ./node_modules/.bin/node-pre-gyp configure rebuild package testpackage --runtime=electron --target=$version --target_arch=$NODE_TARGET_ARCH
+  HOME=~/.electron-gyp ./node_modules/.bin/node-pre-gyp configure rebuild package testpackage --runtime=electron --target=$version --target_arch=$NODE_TARGET_ARCH --disturl=https://atom.io/download/electron
  cp -r build/stage/* artifacts/
 done