From 24fa76aaaab6d90ff86b594216b99a5e7c9fbd7a Mon Sep 17 00:00:00 2001 From: Bert Belder Date: Wed, 5 Aug 2020 20:33:25 +0200 Subject: [PATCH] Upgrade V8 to 8.6.337 (#430) --- README.md | 2 +- base/trace_event/common | 2 +- build | 2 +- build.rs | 2 +- buildtools | 2 +- third_party/zlib | 2 +- tools/clang | 2 +- tools/ninja_gn_binaries.py | 2 +- tools/upgrade_v8.sh | 11 ++++++----- v8 | 2 +- 10 files changed, 15 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index d460a862..ba2ffd49 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Rusty V8 Binding -V8 Version: 8.5.216, 2020-06-25 +V8 Version: 8.6.337, 2020-08-05 [![ci](https://github.com/denoland/rusty_v8/workflows/ci/badge.svg?branch=master)](https://github.com/denoland/rusty_v8/actions) [![crates](https://img.shields.io/crates/v/rusty_v8.svg)](https://crates.io/crates/rusty_v8) diff --git a/base/trace_event/common b/base/trace_event/common index ef358680..23ef5333 160000 --- a/base/trace_event/common +++ b/base/trace_event/common @@ -1 +1 @@ -Subproject commit ef3586804494b7e402b6c1791d5dccdf2971afff +Subproject commit 23ef5333a357fc7314630ef88b44c3a545881dee diff --git a/build b/build index f503a500..f9d174a0 160000 --- a/build +++ b/build @@ -1 +1 @@ -Subproject commit f503a500c8d6da6c1fb525d445a431c6ff8a37ed +Subproject commit f9d174a05aa7588a89616aed121e5f8ca12687ae diff --git a/build.rs b/build.rs index bc47afc4..5972d243 100644 --- a/build.rs +++ b/build.rs @@ -149,7 +149,7 @@ fn download_ninja_gn_binaries() { .parent() .unwrap(); let bin_dir = target_dir - .join("ninja_gn_binaries-20200506") + .join("ninja_gn_binaries-20200806") .join(platform()); let gn = bin_dir.join("gn"); let ninja = bin_dir.join("ninja"); diff --git a/buildtools b/buildtools index 7c62aff2..deee1e07 160000 --- a/buildtools +++ b/buildtools @@ -1 +1 @@ -Subproject commit 7c62aff244e3e705ad8c154c706e2aed87201611 +Subproject commit deee1e0703b6f42c3cd2ba848a988dc54ac02212 diff --git a/third_party/zlib b/third_party/zlib index 93be846a..7492de9a 160000 --- a/third_party/zlib +++ b/third_party/zlib @@ -1 +1 @@ -Subproject commit 93be846a6cf7826ba2b372ce5c0432b4b94d64ff +Subproject commit 7492de9a52f656b070f41968e39a6efa603590d5 diff --git a/tools/clang b/tools/clang index 62d4c433..8a232eb2 160000 --- a/tools/clang +++ b/tools/clang @@ -1 +1 @@ -Subproject commit 62d4c43363c5571ca427cfea4d92d699eb26f72a +Subproject commit 8a232eb21c25d1901794b418b8aeaae772e3cd0f diff --git a/tools/ninja_gn_binaries.py b/tools/ninja_gn_binaries.py index ae256be8..e57a5e68 100755 --- a/tools/ninja_gn_binaries.py +++ b/tools/ninja_gn_binaries.py @@ -18,7 +18,7 @@ except ImportError: # For Py3 compatibility from urllib.error import HTTPError, URLError from urllib.request import urlopen -URL = "https://github.com/denoland/ninja_gn_binaries/archive/20200506.tar.gz" +URL = "https://github.com/denoland/ninja_gn_binaries/archive/20200806.tar.gz" DIR = None diff --git a/tools/upgrade_v8.sh b/tools/upgrade_v8.sh index 71bfdf6e..08f209c5 100644 --- a/tools/upgrade_v8.sh +++ b/tools/upgrade_v8.sh @@ -1,15 +1,16 @@ # WARNING: This is not an automated tool! This is just some commands to copy and # paste manually to upgrade V8. -export BRANCH=20200626_rusty_v8 -export COMMITDATE=2020-06-25T12:06:47.000Z +export BRANCH=20200806_rusty_v8 +export COMMITDATE=2020-08-05T17:03:41.000Z +git submodule update -f git submodule foreach 'git remote rm upstream; true' && git -C build remote add upstream https://chromium.googlesource.com/chromium/src/build && git -C buildtools remote add upstream https://chromium.googlesource.com/chromium/src/buildtools && -git submodule foreach 'git remote add upstream `git remote get-url origin`; true' && -git submodule foreach 'git remote update' && -git submodule foreach 'export SHA=`git log upstream/master -n1 --until=$COMMITDATE --pretty=%H` && git merge $SHA -m "Merge commit $SHA from `git remote get-url upstream`"' +git submodule foreach '[ -f ./include/v8.h ] || (git remote add upstream `git remote get-url origin`; true)' && +git submodule foreach '[ -f ./include/v8.h ] || git remote update' && +git submodule foreach '[ -f ./include/v8.h ] || (export SHA=`git log upstream/master -n1 --until=$COMMITDATE --pretty=%H` && git merge $SHA -m "Merge commit $SHA from `git remote get-url upstream`")' git -C build push git@github.com:denoland/chromium_build HEAD:refs/heads/$BRANCH git -C buildtools push git@github.com:denoland/chromium_buildtools HEAD:refs/heads/$BRANCH diff --git a/v8 b/v8 index fb20b5d8..4f52dde7 160000 --- a/v8 +++ b/v8 @@ -1 +1 @@ -Subproject commit fb20b5d83e381586c7b16fc7aad554eaa5432416 +Subproject commit 4f52dde736e657ac01cf74a6cdc38c752f9a5dae