Merge pull request #1684 from jmeinke/native_electron_10_and_11

Create prebuilts for native electron 10 and 11
grpc · Feb 8, 2021 · ea5b04e · ea5b04e
2 parents e959c55 + f73b869
commit ea5b04e
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -26,11 +26,11 @@ jobs:
     - uses: actions/checkout@v2
       with:
         submodules: recursive
-    - uses: actions/setup-node@v1.4.2
+    - uses: actions/setup-node@v2
       with:
         node-version: 14
     - name: Setup MSBuild
-      uses: microsoft/setup-msbuild@v1.0.0
+      uses: microsoft/setup-msbuild@v1
       if: ${{matrix.os == 'windows-latest'}}
     - name: Build
       run: packages/grpc-native-core/tools/run_tests/artifacts/build_one_artifact_${{matrix.os}}.sh
@@ -46,7 +46,7 @@ jobs:
     name: All Electron Builds
     strategy:
       matrix:
-        electron: ['1.0', '1.1', '1.2', '1.3', '1.4', '1.5', '1.6', '1.7', '1.8', '2.0', '3.0', '3.1', '4.1', '4.2', '5.0', '6.0', '6.1', '7.0', '7.1', '7.2', '7.3', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5', '9.0', '9.1', '9.2', '9.3', '10.0', '10.1']
+        electron: ['1.0', '1.1', '1.2', '1.3', '1.4', '1.5', '1.6', '1.7', '1.8', '2.0', '3.0', '3.1', '4.1', '4.2', '5.0', '6.0', '6.1', '7.0', '7.1', '7.2', '7.3', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5', '9.0', '9.1', '9.2', '9.3', '10.0', '10.1', '10.2', '10.3', '11.0', '11.1', '11.2']
         arch: [ia32, x64]
         os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{matrix.os}}
@@ -59,11 +59,11 @@ jobs:
     - uses: actions/checkout@v2
       with:
         submodules: recursive
-    - uses: actions/setup-node@v1.4.2
+    - uses: actions/setup-node@v2
       with:
         node-version: 14
     - name: Setup MSBuild
-      uses: microsoft/setup-msbuild@v1.0.0
+      uses: microsoft/setup-msbuild@v1
       if: ${{matrix.os == 'windows-latest'}}
     - name: Build
       run: packages/grpc-native-core/tools/run_tests/artifacts/build_one_artifact_${{matrix.os}}.sh
@@ -131,4 +131,4 @@ jobs:
     - uses: actions/upload-artifact@v2
       with:
         name: combined-artifacts
-        path: artifacts/
+        path: artifacts/
diff --git a/packages/grpc-native-core/README.md b/packages/grpc-native-core/README.md
@@ -11,7 +11,7 @@
 ## LATEST VERSIONS SUPPORTED
 
  - Node: 14
- - Electron: 10.1
+ - Electron: 11.2
 
 ## INSTALLATION
 

diff --git a/packages/grpc-native-core/binding.gyp b/packages/grpc-native-core/binding.gyp
@@ -91,7 +91,7 @@
       'GPR_BACKWARDS_COMPATIBILITY_MODE',
       'GRPC_ARES=1',
       'GRPC_UV',
-      'GRPC_NODE_VERSION="1.24.4"',
+      'GRPC_NODE_VERSION="1.24.5"',
       'CARES_STATICLIB',
       'CARES_SYMBOL_HIDING'
     ],

diff --git a/packages/grpc-native-core/build.yaml b/packages/grpc-native-core/build.yaml
@@ -1,3 +1,3 @@
 settings:
   '#': It's possible to have node_version here as a key to override the core's version.
-  node_version: 1.24.4
+  node_version: 1.24.5
diff --git a/packages/grpc-native-core/package.json b/packages/grpc-native-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "grpc",
-  "version": "1.24.4",
+  "version": "1.24.5",
   "author": "Google Inc.",
   "description": "gRPC Library for Node",
   "homepage": "https://grpc.io/",