Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(138)

Unified Diff: tools/release/auto_roll.py

Issue 878913002: Let release scripts determine version based on tags. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Remove unused method. Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tools/release/auto_push.py ('k') | tools/release/chromium_roll.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/release/auto_roll.py
diff --git a/tools/release/auto_roll.py b/tools/release/auto_roll.py
index b8504bbe1476f097c05afc246c9993b561178aca..2cba6af4fb9dbf39166d16a43c9b07e52b2c5c2e 100755
--- a/tools/release/auto_roll.py
+++ b/tools/release/auto_roll.py
@@ -38,29 +38,31 @@ class CheckActiveRoll(Step):
return True
-class DetectLastPush(Step):
- MESSAGE = "Detect commit ID of the last push to candidates."
-
- def RunStep(self):
- self.vc.Fetch()
- push_hash = self.FindLastCandidatesPush(
- branch="origin/candidates", include_patches=True)
- self["last_push"] = self.GetCommitPositionNumber(push_hash)
-
-
class DetectLastRoll(Step):
MESSAGE = "Detect commit ID of the last Chromium roll."
def RunStep(self):
+ # The revision that should be rolled.
+ latest_release = self.GetLatestRelease()
+
# Interpret the DEPS file to retrieve the v8 revision.
# TODO(machenbach): This should be part or the roll-deps api of
# depot_tools.
Var = lambda var: '%s'
exec(FileToText(os.path.join(self._options.chromium, "DEPS")))
- last_roll = self.GetCommitPositionNumber(vars['v8_revision'])
- # FIXME(machenbach): When rolling from master and from candidates there
- # will be different commit numbers here. Better use version?
- if int(last_roll) >= int(self["last_push"]):
+
+ # The revision rolled last.
+ last_roll = vars['v8_revision']
+
+ # TODO(machenbach): It is possible that the auto-push script made a new
+ # fast-forward release (e.g. 4.2.3) while somebody patches the last
+ # candidate (e.g. 4.2.2.1). In this case, the auto-roller would pick
+ # the fast-forward release. Should there be a way to prioritize the
+ # patched version?
+
+ if latest_release == last_roll:
+ # We always try to roll if the latest revision is not the revision in
+ # chromium.
print("There is no newer v8 revision than the one in Chromium (%s)."
% last_roll)
return True
@@ -131,7 +133,6 @@ class AutoRoll(ScriptsBase):
def _Steps(self):
return [
CheckActiveRoll,
- DetectLastPush,
DetectLastRoll,
CheckClusterFuzz,
RollChromium,
« no previous file with comments | « tools/release/auto_push.py ('k') | tools/release/chromium_roll.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698