Merge pull request #1760 from murgatroid99/native_node_16_support

Native: build Node 16 binaries
grpc · Apr 30, 2021 · 64e699c · 64e699c
2 parents 1fb9a3f + 8b9185b
commit 64e699c
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,7 +13,7 @@ jobs:
     name: All Simple Native Builds
     strategy:
       matrix:
-        node: ['4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14']
+        node: ['4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '16']
         arch: [ia32, x64]
         os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{matrix.os}}
@@ -80,7 +80,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: ['4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14']
+        node: ['4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '16']
     env:
       ARCH: x64
       VERSION: ${{matrix.node}}.0.0
@@ -101,7 +101,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: ['4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14']
+        node: ['4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '16']
         arch: [arm, arm64, s390x]
     env:
       ARCH: ${{matrix.arch}}

diff --git a/packages/grpc-native-core/README.md b/packages/grpc-native-core/README.md
@@ -1,7 +1,7 @@
 [![npm](https://img.shields.io/npm/v/grpc.svg)](https://www.npmjs.com/package/grpc)
 # Node.js gRPC Library
 
-**This library is now only receiving bug fixes and runtime compatibility updates. In April 2021 it will be deprecated and will no longer receive any updates. We recommend using [`@grpc/grpc-js`](https://www.npmjs.com/package/@grpc/grpc-js) instead.**
+**As of April 2021 this library is deprecated and will no longer receive any updates. We recommend using [`@grpc/grpc-js`](https://www.npmjs.com/package/@grpc/grpc-js) instead.**
 
 ## PREREQUISITES
 - `node`: This requires `node` to be installed, version `4.0` or above. If you instead have the `nodejs` executable on Debian, you should install the [`nodejs-legacy`](https://packages.debian.org/sid/nodejs-legacy) package.

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.7"',
+      'GRPC_NODE_VERSION="1.24.8"',
       '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.7
+  node_version: 1.24.8
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.7",
+  "version": "1.24.8",
   "author": "Google Inc.",
   "description": "gRPC Library for Node",
   "homepage": "https://grpc.io/",
@@ -26,11 +26,11 @@
     "prepack": "git submodule update --init --recursive && npm install"
   },
   "dependencies": {
+    "@mapbox/node-pre-gyp": "^1.0.4",
     "@types/bytebuffer": "^5.0.40",
     "lodash.camelcase": "^4.3.0",
     "lodash.clone": "^4.5.0",
     "nan": "^2.13.2",
-    "node-pre-gyp": "^0.16.0",
     "protobufjs": "^5.0.3"
   },
   "devDependencies": {

diff --git a/packages/grpc-native-core/templates/package.json.template b/packages/grpc-native-core/templates/package.json.template
@@ -28,11 +28,11 @@
       "prepack": "git submodule update --init --recursive && npm install"
     },
     "dependencies": {
+      "@mapbox/node-pre-gyp": "^1.0.4",
       "@types/bytebuffer": "^5.0.40",
       "lodash.camelcase": "^4.3.0",
       "lodash.clone": "^4.5.0",
       "nan": "^2.13.2",
-      "node-pre-gyp": "^0.16.0",
       "protobufjs": "^5.0.3"
     },
     "devDependencies": {