Skip to content

Commit 2a9c724

Browse files
authored
Merge pull request #848 from murgatroid99/electron_5
Build Electron 5 artifacts
2 parents 4e7c987 + 32c18a4 commit 2a9c724

File tree

4 files changed

+8
-2
lines changed

4 files changed

+8
-2
lines changed

packages/grpc-native-core/binding.gyp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,9 @@
9393
'GRPC_UV',
9494
'GRPC_NODE_VERSION="1.20.2"'
9595
],
96+
'defines!': [
97+
'OPENSSL_THREADS'
98+
],
9699
'conditions': [
97100
['grpc_gcov=="true"', {
98101
'cflags': [

packages/grpc-native-core/templates/binding.gyp.template

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,9 @@
8585
'GRPC_UV',
8686
'GRPC_NODE_VERSION="${settings.get('node_version', settings.version)}"'
8787
],
88+
'defines!': [
89+
'OPENSSL_THREADS'
90+
],
8891
'conditions': [
8992
['grpc_gcov=="true"', {
9093
% for arg, prop in [('CPPFLAGS', 'cflags'), ('DEFINES', 'defines'), ('LDFLAGS', 'ldflags')]:

packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_electron.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
set arch_list=ia32 x64
1616

17-
set electron_versions=1.0.0 1.1.0 1.2.0 1.3.0 1.4.0 1.5.0 1.6.0 1.7.0 1.8.0 2.0.0 3.0.0 3.1.0 4.1.0
17+
set electron_versions=1.0.0 1.1.0 1.2.0 1.3.0 1.4.0 1.5.0 1.6.0 1.7.0 1.8.0 2.0.0 3.0.0 3.1.0 4.1.0 5.0.0
1818

1919
set PATH=%PATH%;C:\Program Files\nodejs\;%APPDATA%\npm
2020

packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_electron.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
set -ex
1717

1818
arch_list=( ia32 x64 )
19-
electron_versions=( 1.0.0 1.1.0 1.2.0 1.3.0 1.4.0 1.5.0 1.6.0 1.7.0 1.8.0 2.0.0 3.0.0 3.1.0 4.1.0 )
19+
electron_versions=( 1.0.0 1.1.0 1.2.0 1.3.0 1.4.0 1.5.0 1.6.0 1.7.0 1.8.0 2.0.0 3.0.0 3.1.0 4.1.0 5.0.0 )
2020

2121
umask 022
2222

0 commit comments

Comments
 (0)