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

Unified Diff: tools/release/common_includes.py

Issue 1403293009: [Release] Make release scripts aware of packed tags (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Renamed test Created 5 years, 1 month 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 | « no previous file | tools/release/test_scripts.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/release/common_includes.py
diff --git a/tools/release/common_includes.py b/tools/release/common_includes.py
index 19841a34a66d640ee07ebed50192194ffc2a2bb1..41fe35962480432211981d036609d6112d89e140 100644
--- a/tools/release/common_includes.py
+++ b/tools/release/common_includes.py
@@ -50,7 +50,6 @@ 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")
-VERSION_RE = re.compile(r"^\d+\.\d+\.\d+(?:\.\d+)?$")
# V8 base directory.
V8_BASE = os.path.dirname(
@@ -206,6 +205,30 @@ def Command(cmd, args="", prefix="", pipe=True, cwd=None):
sys.stderr.flush()
+def SanitizeVersionTag(tag):
+ version_without_prefix = re.compile(r"^\d+\.\d+\.\d+(?:\.\d+)?$")
+ version_with_prefix = re.compile(r"^tags\/\d+\.\d+\.\d+(?:\.\d+)?$")
+
+ if version_without_prefix.match(tag):
+ return tag
+ elif version_with_prefix.match(tag):
+ return tag[len("tags/"):]
+ else:
+ return None
+
+
+def NormalizeVersionTags(version_tags):
+ normalized_version_tags = []
+
+ # Remove tags/ prefix because of packed refs.
+ for current_tag in version_tags:
+ version_tag = SanitizeVersionTag(current_tag)
+ if version_tag != None:
+ normalized_version_tags.append(version_tag)
+
+ return normalized_version_tags
+
+
# Wrapper for side effects.
class SideEffectHandler(object): # pragma: no cover
def Call(self, fun, *args, **kwargs):
@@ -607,10 +630,7 @@ class Step(GitRecipesMixin):
def GetVersionTag(self, revision):
tag = self.Git("describe --tags %s" % revision).strip()
- if VERSION_RE.match(tag):
- return tag
- else:
- return None
+ return SanitizeVersionTag(tag)
def GetRecentReleases(self, max_age):
# Make sure tags are fetched.
@@ -633,7 +653,11 @@ class Step(GitRecipesMixin):
# Make sure tags are fetched.
self.Git("fetch origin +refs/tags/*:refs/tags/*")
- version = sorted(filter(VERSION_RE.match, self.vc.GetTags()),
+
+ all_tags = self.vc.GetTags()
+ only_version_tags = NormalizeVersionTags(all_tags)
+
+ version = sorted(only_version_tags,
key=SortingKey, reverse=True)[0]
self["latest_version"] = version
return version
« no previous file with comments | « no previous file | tools/release/test_scripts.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698