Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adding initial node 10 support. #302

Merged
merged 10 commits into from
May 2, 2018
Merged

Adding initial node 10 support. #302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9d1904f
Adding initial node 10 support.
nicolasnoble May 1, 2018
e358560
Building with node 10, because otherwise there's a weird issue, and I…
nicolasnoble May 1, 2018
5f47953
Installing nvm from kokoro scripts.
nicolasnoble May 1, 2018
582c171
Shuffling things around a bit better...
nicolasnoble May 1, 2018
c94718c
Let's double down on installing node 10...
nicolasnoble May 2, 2018
727e54e
Right. We need to install nvm into the docker image.
nicolasnoble May 2, 2018
d465566
More nvm love.
nicolasnoble May 2, 2018
c794c05
Merge branch 'v1.11.x' of https://github.com/grpc/grpc-node into node-10
nicolasnoble May 2, 2018
c5fbaf1
Reverting these...
nicolasnoble May 2, 2018
30310d7
Better this way...
nicolasnoble May 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/grpc-native-core/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.11.0
'node_version': 1.11.1
4 changes: 2 additions & 2 deletions packages/grpc-native-core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "grpc",
"version": "1.11.0",
"version": "1.11.1",
"author": "Google Inc.",
"description": "gRPC Library for Node",
"homepage": "https://grpc.io/",
Expand Down Expand Up @@ -30,7 +30,7 @@
"dependencies": {
"lodash": "^4.15.0",
"nan": "^2.0.0",
"node-pre-gyp": "0.7.0",
"node-pre-gyp": "^0.10.0",
"protobufjs": "^5.0.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/grpc-native-core/templates/package.json.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"dependencies": {
"lodash": "^4.15.0",
"nan": "^2.0.0",
"node-pre-gyp": "0.7.0",
"node-pre-gyp": "^0.10.0",
"protobufjs": "^5.0.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/grpc-native-core/tools/docker/alpine_artifact/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
FROM node:8-alpine
FROM node:10-alpine
RUN apk add --no-cache python curl bash build-base
2 changes: 1 addition & 1 deletion packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_node.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

set arch_list=ia32 x64

set node_versions=4.0.0 5.0.0 6.0.0 7.0.0 8.0.0 9.0.0
set node_versions=4.0.0 5.0.0 6.0.0 7.0.0 8.0.0 9.0.0 10.0.0

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

Expand Down
3 changes: 1 addition & 2 deletions packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_node.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.


set -ex

arch_list=( ia32 x64 )
node_versions=( 4.0.0 5.0.0 6.0.0 7.0.0 8.0.0 9.0.0 )
node_versions=( 4.0.0 5.0.0 6.0.0 7.0.0 8.0.0 9.0.0 10.0.0 )
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 )

while true ; do
Expand Down
5 changes: 4 additions & 1 deletion packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_node_arm.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@

set -ex

# https://github.com/mapbox/node-pre-gyp/issues/362
npm install -g node-gyp

cd $(dirname $0)/../../..

rm -rf build || true
Expand All @@ -23,7 +26,7 @@ mkdir -p "${ARTIFACTS_OUT}"

npm update

node_versions=( 4.0.0 5.0.0 6.0.0 7.0.0 8.0.0 9.0.0 )
node_versions=( 4.0.0 5.0.0 6.0.0 7.0.0 8.0.0 9.0.0 10.0.0 )

for version in ${node_versions[@]}
do
Expand Down
8 changes: 7 additions & 1 deletion tools/release/kokoro.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,13 @@

@echo "Starting Windows build"

@rem https://github.com/mapbox/node-pre-gyp/issues/362
powershell -c "& { iwr https://raw.githubusercontent.com/grumpycoders/nvm-ps/master/nvm.ps1 | iex }"

SET PATH=%APPDATA%\nvm-ps;%APPDATA%\nvm-ps\nodejs;%PATH%
call nvm install 10
call nvm use 10

call npm install -g npm
call npm install -g node-gyp

cd /d %~dp0
Expand Down
8 changes: 7 additions & 1 deletion tools/release/kokoro.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,13 @@
# See the License for the specific language governing permissions and
# limitations under the License.

# https://github.com/mapbox/node-pre-gyp/issues/362
curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.11/install.sh | bash
export NVM_DIR="$HOME/.nvm"
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"

nvm install 10
nvm use 10
npm install -g npm
npm install -g node-gyp

set -ex
Expand Down