Skip to content

Commit

Permalink
fix: repo/path mismatch in v8 update (#465)
Browse files Browse the repository at this point in the history
  • Loading branch information
Alicia Lopez committed Aug 6, 2020
1 parent 088ae2d commit 93b5ebf
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 13 deletions.
18 changes: 6 additions & 12 deletions lib/update-v8/constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@ const zlibIgnore = `!/third_party/zlib
exports.v8Deps = [
{
name: 'trace_event',
repo: 'v8/base/trace_event/common',
path: 'base/trace_event/common',
repo: 'base/trace_event/common',
gitignore: {
match: '/base\n',
replace: ''
Expand All @@ -44,8 +43,7 @@ exports.v8Deps = [
},
{
name: 'gtest',
repo: 'v8/testing/gtest',
path: 'testing/gtest',
repo: 'testing/gtest',
gitignore: {
match: '/testing/gtest',
replace: gtestReplace
Expand All @@ -55,22 +53,19 @@ exports.v8Deps = [
},
{
name: 'jinja2',
repo: 'v8/third_party/jinja2',
path: 'third_party/jinja2',
repo: 'third_party/jinja2',
gitignore: '!/third_party/jinja2',
since: 56
},
{
name: 'markupsafe',
repo: 'v8/third_party/markupsafe',
path: 'third_party/markupsafe',
repo: 'third_party/markupsafe',
gitignore: '!/third_party/markupsafe',
since: 56
},
{
name: 'googletest',
repo: 'v8/third_party/googletest/src',
path: 'third_party/googletest/src',
repo: 'third_party/googletest/src',
gitignore: {
match: '/third_party/googletest/src',
replace: googleTestReplace
Expand All @@ -79,8 +74,7 @@ exports.v8Deps = [
},
{
name: 'zlib',
repo: 'v8/third_party/zlib',
path: 'third_party/zlib',
repo: 'third_party/zlib',
gitignore: zlibIgnore,
since: 80
}
Expand Down
2 changes: 1 addition & 1 deletion lib/update-v8/majorUpdate.js
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ function updateV8Deps() {
}
}
const [repo, commit] = await readDeps(ctx.nodeDir, dep.repo);
const thePath = path.join(ctx.nodeDir, 'deps/v8', dep.path);
const thePath = path.join(ctx.nodeDir, 'deps/v8', dep.repo);
await fetchFromGit(thePath, repo, commit);
}
/* eslint-enable */
Expand Down

0 comments on commit 93b5ebf

Please sign in to comment.