Reviewers: Michael Achenbach,
Message:
On 2015/04/17 10:55:05, Hablich wrote:
mailto:[email protected] changed reviewers:
+ mailto:[email protected]
PTAL
Description:
Chrome V8 version is now converted to real V8 version
BUG=
Please review this at https://codereview.chromium.org/1090183002/
Base URL: https://chromium.googlesource.com/v8/v8.git@master
Affected files (+17, -17 lines):
M tools/release/releases.py
M tools/release/test_scripts.py
Index: tools/release/releases.py
diff --git a/tools/release/releases.py b/tools/release/releases.py
index
a82da2bddf5aaec98fc9518180fc47297093f9d2..05d83ced6bfa939e0d45de0150adf4c6029e2525
100755
--- a/tools/release/releases.py
+++ b/tools/release/releases.py
@@ -460,11 +460,10 @@ class RetrieveInformationOnChromeReleases(Step):
chrome_releases = {"canaries": canaries}
self["chrome_releases"] = chrome_releases
- def _GetGitHashForV8Version(self, v8_version):
+ def _ConvertToRealV8Version(self, v8_version):
if v8_version.split(".")[3]== "0":
- return self.GitGetHashOfTag(v8_version[:-2])
-
- return self.GitGetHashOfTag(v8_version)
+ return v8_version[:-2]
+ return v8_version
def _CreateCandidate(self, current_version):
params = None
@@ -475,11 +474,13 @@ class RetrieveInformationOnChromeReleases(Step):
params,
wait_plan=[5, 20]
)
- previous_v8_version = json.loads(result_raw)["v8_version"]
- v8_previous_version_hash =
self._GetGitHashForV8Version(previous_v8_version)
+ previous_v8_version = (
+ self._ConvertToRealV8Version(json.loads(result_raw)["v8_version"]))
+ v8_previous_version_hash = self.GitGetHashOfTag(previous_v8_version)
- current_v8_version = current_version["v8_version"]
- v8_version_hash = self._GetGitHashForV8Version(current_v8_version)
+ current_v8_version = (
+ self._ConvertToRealV8Version(current_version["v8_version"]))
+ v8_version_hash = self.GitGetHashOfTag(current_v8_version)
current_candidate = {
"chrome_version": current_version["version"],
Index: tools/release/test_scripts.py
diff --git a/tools/release/test_scripts.py b/tools/release/test_scripts.py
index
dc6f097384bfb0cf3d3816f17b202a53b1db63ac..98c6bb0f8a79cdacd650c241387dd4a4f8f2d769
100644
--- a/tools/release/test_scripts.py
+++ b/tools/release/test_scripts.py
@@ -1454,15 +1454,14 @@ Cr-Commit-Position: refs/heads/4.2.71@{#1}
self.assertEquals(csv, FileToText(csv_output))
expected_json = {"chrome_releases":{
- "canaries": [
- {
- "chrome_version": "2.2.2.2",
- "os": "win",
- "release_date": "04/09/15",
- "v8_version": "22.2.2.2",
- "v8_version_hash": "v8_version_hash",
- "v8_previous_version": "11.1.1.0",
- "v8_previous_version_hash":
"v8_previous_version_hash"
+ "canaries": [{
+ "chrome_version": "2.2.2.2",
+ "os": "win",
+ "release_date": "04/09/15",
+ "v8_version": "22.2.2.2",
+ "v8_version_hash": "v8_version_hash",
+ "v8_previous_version": "11.1.1",
+ "v8_previous_version_hash": "v8_previous_version_hash"
}]},
"releases":[
{
--
--
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.
