Skip to content

v8: fix V8 upgrades from 7.4 #331

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.

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

Merged
merged 4 commits into from
Mar 30, 2019
Merged

v8: fix V8 upgrades from 7.4 #331

merged 4 commits into from
Mar 30, 2019

Conversation

targos
Copy link
Member

@targos targos commented Mar 29, 2019

  • 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.

- 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.
@codecov
Copy link

codecov bot commented Mar 29, 2019

Codecov Report

Merging #331 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #331   +/-   ##
=======================================
  Coverage   75.75%   75.75%           
=======================================
  Files          21       21           
  Lines        1365     1365           
=======================================
  Hits         1034     1034           
  Misses        331      331

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5a27e9c...5845dbb. Read the comment docs.

@targos targos requested a review from joyeecheung March 29, 2019 07:46
@@ -5,7 +5,11 @@ const path = require('path');
const fs = require('fs-extra');

function nodeOwnsGypfiles(ctx) {
if (ctx.currentVersion[0] === 6 && ctx.currentVersion[1] < 6) {
if (
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if (
const hasGypFiles = fs.exists(path.join(ctx.nodeDir, 'deps/v8/gypfiles'));
if (!hasGypFiles) {
return false;
}
const [v8_major, v8_minor, ...] = ctx.currentVersion;
if (v8_major >= 7 || (v8_minor === 6 && v8_minor > 5)) {
return true;
}
return false;

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I went for a more drastic change and removed this code entirely. We won't do major upgrades anymore on the current release lines so in the future gypfiles will always be in tools

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removed this code entirely.

💚

@targos targos merged commit 25d00a0 into nodejs:master Mar 30, 2019
@targos targos deleted the fix-v8-7.4 branch March 30, 2019 12:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants