From d602a30bbc62ee1a48376b4f9f04f134da3ba8c2 Mon Sep 17 00:00:00 2001 From: Shelley Vohr Date: Tue, 12 Dec 2017 22:55:37 -0500 Subject: [PATCH 1/2] update a few steps in upgrading-node.md --- docs/development/upgrading-node.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/development/upgrading-node.md b/docs/development/upgrading-node.md index 53e17c5cc6d1..3ced87209ae4 100644 --- a/docs/development/upgrading-node.md +++ b/docs/development/upgrading-node.md @@ -38,7 +38,8 @@ So in short, the primary steps are: ## Updating Electron's Node [fork](https://github.com/electron/node) -1. Create a branch in https://github.com/electron/node: `electron-node-vX.X.X` +1. Ensure that `master` on `electron/node` has updated release tags from `nodejs/node` +1. Create a branch in https://github.com/electron/node: `electron-node-vX.X.X` where the base that you're branching from is the tag for the desired update - `vX.X.X` Must use a version of node compatible with our current version of chromium 2. Re-apply our commits from the previous version of node we were using (`vY.Y.Y`) to `v.X.X.X` - Check release tag and select the range of commits we need to re-apply From 6f4e97c53aaec99e95e468d20192cfe9d92178f7 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Tue, 19 Dec 2017 09:09:35 -0600 Subject: [PATCH 2/2] (copyediting) renumber steps --- docs/development/upgrading-node.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/development/upgrading-node.md b/docs/development/upgrading-node.md index 3ced87209ae4..227ecf141689 100644 --- a/docs/development/upgrading-node.md +++ b/docs/development/upgrading-node.md @@ -39,9 +39,9 @@ So in short, the primary steps are: ## Updating Electron's Node [fork](https://github.com/electron/node) 1. Ensure that `master` on `electron/node` has updated release tags from `nodejs/node` -1. Create a branch in https://github.com/electron/node: `electron-node-vX.X.X` where the base that you're branching from is the tag for the desired update +2. Create a branch in https://github.com/electron/node: `electron-node-vX.X.X` where the base that you're branching from is the tag for the desired update - `vX.X.X` Must use a version of node compatible with our current version of chromium -2. Re-apply our commits from the previous version of node we were using (`vY.Y.Y`) to `v.X.X.X` +3. Re-apply our commits from the previous version of node we were using (`vY.Y.Y`) to `v.X.X.X` - Check release tag and select the range of commits we need to re-apply - Cherry-pick commit range: 1. Checkout both `vY.Y.Y` & `v.X.X.X`