v8: fix V8 upgrades from 7.4 (nodejs#331)

targos · web-flow · commit 25d00a03d3f8 · 2019-03-30T13:44:56.000+01:00
* v8: fix V8 upgrades from 7.4

- Just increment NODE_MODULE_VERSION automatically by one.
  Now that this constant can also be used by embedders, it is no longer
  predictable
- Add a --no-version-bump so we can skip this task for canary builds.
- From V8 7.4 on, gypfiles are located in tools/ instead of deps/v8.
  Stop trying to move them around.
diff --git a/components/git/v8.js b/components/git/v8.js
@@ -23,6 +23,10 @@ module.exports = {
             describe: 'Branch of the V8 repository to use for the upgrade',
             default: 'lkgr'
           });
+          yargs.option('version-bump', {
+            describe: 'Bump the NODE_MODULE_VERSION constant by one',
+            default: true
+          });
         }
       })
       .command({
@@ -35,14 +39,16 @@ module.exports = {
         desc: 'Backport one or more commits from the V8 repository',
         handler: main,
         builder: (yargs) => {
-          yargs.option('bump', {
-            describe: 'Bump V8 embedder version number or patch version',
-            default: true
-          }).option('squash', {
-            describe:
-              'If multiple commits are backported, squash them into one',
-            default: false
-          });
+          yargs
+            .option('bump', {
+              describe: 'Bump V8 embedder version number or patch version',
+              default: true
+            })
+            .option('squash', {
+              describe:
+                'If multiple commits are backported, squash them into one',
+              default: false
+            });
         }
       })
       .demandCommand(1, 'Please provide a valid command')
diff --git a/docs/git-node.md b/docs/git-node.md
@@ -24,7 +24,7 @@ A custom Git command for managing pull requests. You can run it as
 Note: the prerequistes are not required for `git node v8`.
 
 1. See the readme on how to
-  [set up credentials](../README.md#setting-up-credentials).
+   [set up credentials](../README.md#setting-up-credentials).
 1. It's a Git command, so make sure you have Git installed, of course.
 1. Configure your upstream remote and branch name.
 
@@ -85,7 +85,8 @@ Examples:
 If you are using `git bash` and having trouble with output use
 `winpty git-node.cmd metadata $PRID`.
 
-current known issues with git bash:
+Current known issues with git bash:
+
 - git bash Lacks colors.
 - git bash output duplicates metadata.
 
@@ -244,6 +245,9 @@ Options:
 - `--branch=branchName`: Branch of the V8 repository to use for the upgrade.
   Defaults to `lkgr`.
 
+- `--no-version-bump`: Disable automatic bump of the `NODE_MODULE_VERSION`
+  constant.
+
 ### `git node v8 minor`
 
 Compare current V8 version with latest upstream of the same major. Applies a
diff --git a/lib/update-v8/gypfiles.js b/lib/update-v8/gypfiles.js
diff --git a/lib/update-v8/majorUpdate.js b/lib/update-v8/majorUpdate.js
@@ -14,11 +14,6 @@ const {
   addToGitignore,
   replaceGitignore
 } = require('./util');
-const {
-  moveGypfilesOut,
-  moveGypfilesIn,
-  updateGypfiles
-} = require('./gypfiles');
 const applyNodeChanges = require('./applyNodeChanges');
 const { chromiumGit, v8Deps } = require('./constants');
 
@@ -29,14 +24,11 @@ module.exports = function() {
       return new Listr([
         common.getCurrentV8Version(),
         checkoutBranch(),
-        moveGypfilesOut(),
         removeDepsV8(),
         cloneLocalV8(),
         removeDepsV8Git(),
         updateV8Deps(),
-        applyNodeChanges(),
-        moveGypfilesIn(),
-        updateGypfiles()
+        applyNodeChanges()
       ]);
     }
   };
diff --git a/lib/update-v8/updateVersionNumbers.js b/lib/update-v8/updateVersionNumbers.js
@@ -19,14 +19,10 @@ module.exports = function() {
 function bumpNodeModule() {
   return {
     title: 'Bump NODE_MODULE_VERSION',
-    task: async(ctx, task) => {
+    task: async(ctx) => {
       const v8Version = util.getNodeV8Version(ctx.nodeDir);
       const currentModuleVersion = getModuleVersion(ctx.nodeDir);
-      const newModuleVersion = translateV8ToModuleVersion(v8Version);
-      if (currentModuleVersion === newModuleVersion) {
-        task.skip('version is the same');
-        return;
-      }
+      const newModuleVersion = currentModuleVersion + 1;
       updateModuleVersion(ctx.nodeDir, newModuleVersion, v8Version);
       await ctx.execGitNode('add', 'src/node_version.h');
       await ctx.execGitNode(
@@ -36,7 +32,8 @@ function bumpNodeModule() {
         '-m',
         getCommitBody(v8Version)
       );
-    }
+    },
+    skip: (ctx) => ctx.noVersionBump
   };
 }
 
@@ -62,10 +59,6 @@ function updateModuleVersion(nodeDir, newVersion, v8Version) {
   fs.writeFileSync(path, nodeVersionH);
 }
 
-function translateV8ToModuleVersion(v8Version) {
-  return parseInt(String(v8Version[0]) + String(v8Version[1]), 10) - 3;
-}
-
 function getCommitTitle(moduleVersion) {
   return `src: update NODE_MODULE_VERSION to ${moduleVersion}`;
 }
