aboutsummaryrefslogtreecommitdiff
path: root/deps/v8/tools/release
diff options
context:
space:
mode:
authorAli Ijaz Sheikh <ofrobots@google.com>2016-04-07 14:06:55 -0700
committerAli Ijaz Sheikh <ofrobots@google.com>2016-04-14 10:03:39 -0700
commit52af5c4eebf4de8638aef0338bd826656312a02a (patch)
tree628dc9fb0b558c3a73a2160706fef368876fe548 /deps/v8/tools/release
parent6e3e8acc7cc7ebd3d67db5ade1247b8b558efe09 (diff)
downloadandroid-node-v8-52af5c4eebf4de8638aef0338bd826656312a02a.tar.gz
android-node-v8-52af5c4eebf4de8638aef0338bd826656312a02a.tar.bz2
android-node-v8-52af5c4eebf4de8638aef0338bd826656312a02a.zip
deps: upgrade V8 to 5.0.71.32
* Pick up the branch head for V8 5.0 stable [1] * Edit v8 gitignore to allow trace_event copy * Update V8 DEP trace_event as per deps/v8/DEPS [2] [1] https://chromium.googlesource.com/v8/v8.git/+/3c67831 [2] https://chromium.googlesource.com/chromium/src/base/trace_event/common/+/4b09207e447ae5bd34643b4c6321bee7b76d35f9 Ref: https://github.com/nodejs/node/pull/5945 PR-URL: https://github.com/nodejs/node/pull/6111 Reviewed-By: targos - Michaƫl Zasso <mic.besace@gmail.com> Reviewed-By: bnoordhuis - Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: indutny - Fedor Indutny <fedor.indutny@gmail.com>
Diffstat (limited to 'deps/v8/tools/release')
-rwxr-xr-xdeps/v8/tools/release/auto_roll.py1
-rw-r--r--deps/v8/tools/release/common_includes.py3
-rwxr-xr-xdeps/v8/tools/release/create_release.py16
-rw-r--r--deps/v8/tools/release/test_scripts.py31
4 files changed, 45 insertions, 6 deletions
diff --git a/deps/v8/tools/release/auto_roll.py b/deps/v8/tools/release/auto_roll.py
index 27fd370971..fc9aeee461 100755
--- a/deps/v8/tools/release/auto_roll.py
+++ b/deps/v8/tools/release/auto_roll.py
@@ -123,7 +123,6 @@ class UpdateChromiumCheckout(Step):
cwd = self._options.chromium
self.GitCheckout("master", cwd=cwd)
self.DeleteBranch("work-branch", cwd=cwd)
- self.Command("gclient", "sync --nohooks", cwd=cwd)
self.GitPull(cwd=cwd)
# Update v8 remotes.
diff --git a/deps/v8/tools/release/common_includes.py b/deps/v8/tools/release/common_includes.py
index c2b64c38ec..c3a216c664 100644
--- a/deps/v8/tools/release/common_includes.py
+++ b/deps/v8/tools/release/common_includes.py
@@ -50,6 +50,7 @@ DAY_IN_SECONDS = 24 * 60 * 60
PUSH_MSG_GIT_RE = re.compile(r".* \(based on (?P<git_rev>[a-fA-F0-9]+)\)$")
PUSH_MSG_NEW_RE = re.compile(r"^Version \d+\.\d+\.\d+$")
VERSION_FILE = os.path.join("include", "v8-version.h")
+WATCHLISTS_FILE = "WATCHLISTS"
# V8 base directory.
V8_BASE = os.path.dirname(
@@ -381,7 +382,7 @@ class GitInterface(VCInterface):
# is the case for all automated merge and push commits - also no title is
# the prefix of another title).
commit = None
- for wait_interval in [3, 7, 15, 35, 45, 60]:
+ for wait_interval in [5, 10, 20, 40, 60, 60]:
self.step.Git("fetch")
commit = self.step.GitLog(n=1, format="%H", grep=message, branch=remote)
if commit:
diff --git a/deps/v8/tools/release/create_release.py b/deps/v8/tools/release/create_release.py
index 3bbb50e491..7477ea1461 100755
--- a/deps/v8/tools/release/create_release.py
+++ b/deps/v8/tools/release/create_release.py
@@ -11,7 +11,6 @@ import urllib2
from common_includes import *
-
class Preparation(Step):
MESSAGE = "Preparation."
@@ -164,6 +163,7 @@ class MakeBranch(Step):
self.Git("checkout -b work-branch %s" % self["push_hash"])
self.GitCheckoutFile(CHANGELOG_FILE, self["latest_version"])
self.GitCheckoutFile(VERSION_FILE, self["latest_version"])
+ self.GitCheckoutFile(WATCHLISTS_FILE, self["latest_version"])
class AddChangeLog(Step):
@@ -183,6 +183,19 @@ class SetVersion(Step):
self.SetVersion(os.path.join(self.default_cwd, VERSION_FILE), "new_")
+class EnableMergeWatchlist(Step):
+ MESSAGE = "Enable watchlist entry for merge notifications."
+
+ def RunStep(self):
+ old_watchlist_content = FileToText(os.path.join(self.default_cwd,
+ WATCHLISTS_FILE))
+ new_watchlist_content = re.sub("(# 'v8-merges@googlegroups\.com',)",
+ "'v8-merges@googlegroups.com',",
+ old_watchlist_content)
+ TextToFile(new_watchlist_content, os.path.join(self.default_cwd,
+ WATCHLISTS_FILE))
+
+
class CommitBranch(Step):
MESSAGE = "Commit version and changelog to new branch."
@@ -288,6 +301,7 @@ class CreateRelease(ScriptsBase):
MakeBranch,
AddChangeLog,
SetVersion,
+ EnableMergeWatchlist,
CommitBranch,
PushBranch,
TagRevision,
diff --git a/deps/v8/tools/release/test_scripts.py b/deps/v8/tools/release/test_scripts.py
index 4a3cb5b24a..4f133ac28a 100644
--- a/deps/v8/tools/release/test_scripts.py
+++ b/deps/v8/tools/release/test_scripts.py
@@ -43,8 +43,6 @@ import merge_to_branch
from merge_to_branch import *
import push_to_candidates
from push_to_candidates import *
-import chromium_roll
-from chromium_roll import ChromiumRoll
import releases
from releases import Releases
from auto_tag import AutoTag
@@ -391,6 +389,20 @@ class ScriptTest(unittest.TestCase):
f.write(" // Some line...\n")
f.write("#define V8_IS_CANDIDATE_VERSION 0\n")
+ def WriteFakeWatchlistsFile(self):
+ watchlists_file = os.path.join(TEST_CONFIG["DEFAULT_CWD"], WATCHLISTS_FILE)
+ if not os.path.exists(os.path.dirname(watchlists_file)):
+ os.makedirs(os.path.dirname(watchlists_file))
+ with open(watchlists_file, "w") as f:
+
+ content = """
+ 'merges': [
+ # Only enabled on branches created with tools/release/create_release.py
+ # 'v8-merges@googlegroups.com',
+ ],
+"""
+ f.write(content)
+
def MakeStep(self):
"""Convenience wrapper."""
options = ScriptsBase(TEST_CONFIG, self, self._state).MakeOptions([])
@@ -954,6 +966,8 @@ Performance and stability improvements on all platforms."""
Cmd("git checkout -f 3.22.4 -- ChangeLog", "", cb=ResetChangeLog),
Cmd("git checkout -f 3.22.4 -- include/v8-version.h", "",
cb=self.WriteFakeVersionFile),
+ Cmd("git checkout -f 3.22.4 -- WATCHLISTS", "",
+ cb=self.WriteFakeWatchlistsFile),
Cmd("git commit -aF \"%s\"" % TEST_CONFIG["COMMITMSG_FILE"], "",
cb=CheckVersionCommit),
Cmd("git push origin "
@@ -985,6 +999,18 @@ Performance and stability improvements on all platforms."""
# Note: The version file is on build number 5 again in the end of this test
# since the git command that merges to master is mocked out.
+ # Check for correct content of the WATCHLISTS file
+
+ watchlists_content = FileToText(os.path.join(TEST_CONFIG["DEFAULT_CWD"],
+ WATCHLISTS_FILE))
+ expected_watchlists_content = """
+ 'merges': [
+ # Only enabled on branches created with tools/release/create_release.py
+ 'v8-merges@googlegroups.com',
+ ],
+"""
+ self.assertEqual(watchlists_content, expected_watchlists_content)
+
C_V8_22624_LOG = """V8 CL.
git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@22624 123
@@ -1086,7 +1112,6 @@ deps = {
Cmd("git status -s -uno", "", cwd=chrome_dir),
Cmd("git checkout -f master", "", cwd=chrome_dir),
Cmd("git branch", "", cwd=chrome_dir),
- Cmd("gclient sync --nohooks", "syncing...", cwd=chrome_dir),
Cmd("git pull", "", cwd=chrome_dir),
Cmd("git fetch origin", ""),
Cmd("git new-branch work-branch", "", cwd=chrome_dir),