Reviewers: tandrii(chromium), Hablich,
Message:
PTAL
Description:
Fix progress check in auto-roller.
Using a git range check for checking progress is wrong when
the last rolled revision and the revision candidate are on
different branches. The range A..B will always show the
commits from the merge-base of A and B until B.
Better compare the tags of the last rolled revision and the
candidate. The candidate's version must be strictly greater
than what's in chromium.
[email protected]
NOTRY=true
TEST=./script_test.py
Please review this at https://codereview.chromium.org/979133002/
Base URL: https://chromium.googlesource.com/v8/v8.git@master
Affected files (+11, -6 lines):
M tools/release/auto_roll.py
M tools/release/test_scripts.py
Index: tools/release/auto_roll.py
diff --git a/tools/release/auto_roll.py b/tools/release/auto_roll.py
index
8d21280e3db91e3a80393dc6cc4b493b1e96539f..f7692cf6f9775681a9afdb6c13d82c60bb874044
100755
--- a/tools/release/auto_roll.py
+++ b/tools/release/auto_roll.py
@@ -56,6 +56,8 @@ class DetectLastRoll(Step):
# The revision rolled last.
self["last_roll"] = vars['v8_revision']
+ last_version = self.GetVersionTag(self["last_roll"])
+ assert last_version, "The last rolled v8 revision is not tagged."
# There must be some progress between the last roll and the new
candidate
# revision (i.e. we don't go backwards). The revisions are ordered
newest
@@ -63,9 +65,10 @@ class DetectLastRoll(Step):
# compared to the last roll, i.e. if the newest release is a
cherry-pick
# on a release branch. Then we look further.
for revision in revisions:
- commits = self.GitLog(
- format="%H", git_hash="%s..%s" % (self["last_roll"], revision))
- if commits:
+ version = self.GetVersionTag(revision)
+ assert version, "Internal error. All recent releases should have a
tag"
+
+ if SortingKey(last_version) < SortingKey(version):
self["roll"] = revision
break
else:
Index: tools/release/test_scripts.py
diff --git a/tools/release/test_scripts.py b/tools/release/test_scripts.py
index
68d30cd60b4215969d45c53743e423c3fafa7d33..aeb9c20ab7cb1c2666fdec26700cba67bf79bef1
100644
--- a/tools/release/test_scripts.py
+++ b/tools/release/test_scripts.py
@@ -1115,8 +1115,9 @@ deps = {
Cmd("git describe --tags bad_tag", ""),
Cmd("git describe --tags hash_234", "3.22.4"),
Cmd("git describe --tags hash_123", "3.22.3"),
- Cmd("git log --format=%H abcd123455..hash_234", ""),
- Cmd("git log --format=%H abcd123455..hash_123", ""),
+ Cmd("git describe --tags abcd123455", "3.22.4"),
+ Cmd("git describe --tags hash_234", "3.22.4"),
+ Cmd("git describe --tags hash_123", "3.22.3"),
])
result = auto_roll.AutoRoll(TEST_CONFIG, self).Run(
@@ -1137,7 +1138,8 @@ deps = {
Cmd("git describe --tags bad_tag", ""),
Cmd("git describe --tags hash_234", "3.22.4"),
Cmd("git describe --tags hash_123", "3.22.3"),
- Cmd("git log --format=%H abcd123455..hash_234", "hash1\nhash2\n"),
+ Cmd("git describe --tags abcd123455", "3.22.3.1"),
+ Cmd("git describe --tags hash_234", "3.22.4"),
])
result = auto_roll.AutoRoll(TEST_CONFIG, self).Run(
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
