AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Switch v8 mirror in version script.

Browse Source 
BUG=410721
LOG=n
TBR=tandrii@chromium.org

Review URL: https://codereview.chromium.org/601103003

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@24203 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
machenbach@chromium.org 2014-09-25 07:30:18 +00:00
parent 2a67e48f0e
commit b790fd6b59
2 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/push-to-trunk/bump_up_version.py
View File

@ -37,8 +37,7 @@ class Preparation(Step):
# This is in case a developer runs this script on a dirty tree.
self.GitStash()
# TODO(machenbach): This should be called master after the git switch.
self.GitCheckout("bleeding_edge")
self.GitCheckout("master")
self.GitPull()
@ -50,8 +49,7 @@ class GetCurrentBleedingEdgeVersion(Step):
MESSAGE = "Get latest bleeding edge version."
def RunStep(self):
# TODO(machenbach): This should be called master after the git switch.
self.GitCheckout("bleeding_edge")
self.GitCheckout("master")
# Store latest version and revision.
self.ReadAndPersistVersion()
@ -88,7 +86,7 @@ class GetLKGRVersion(Step):
MESSAGE = "Get bleeding edge lkgr version."
def RunStep(self):
self.GitCheckout("bleeding_edge")
self.GitCheckout("master")
# If the commit was made from svn, there is a mapping entry in the commit
# message.
self["lkgr"] = self.GitLog(
@ -106,7 +104,7 @@ class GetLKGRVersion(Step):
print "LKGR version: %s" % self["lkgr_version"]
# Ensure a clean version branch.
self.GitCheckout("bleeding_edge")
self.GitCheckout("master")
self.DeleteBranch(VERSION_BRANCH)
@ -131,8 +129,7 @@ class GetTrunkVersion(Step):
MESSAGE = "Get latest trunk version."
def RunStep(self):
# TODO(machenbach): This should be called trunk after the git switch.
self.GitCheckout("master")
self.GitCheckout("candidates")
self.GitPull()
self.ReadAndPersistVersion("trunk_")
self["trunk_version"] = self.ArrayToVersion("trunk_")
@ -186,7 +183,7 @@ class ChangeVersion(Step):
MESSAGE = "Bump up the version."
def RunStep(self):
self.GitCreateBranch(VERSION_BRANCH, "bleeding_edge")
self.GitCreateBranch(VERSION_BRANCH, "master")
self.SetVersion(os.path.join(self.default_cwd, VERSION_FILE), "new_")
@ -204,7 +201,7 @@ class ChangeVersion(Step):
print "Successfully changed the version."
finally:
# Clean up.
self.GitCheckout("bleeding_edge")
self.GitCheckout("master")
self.DeleteBranch(VERSION_BRANCH)

23
tools/push-to-trunk/test_scripts.py
View File

@ -1374,26 +1374,27 @@ git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3456 0039-1c4b
return [
Cmd("git status -s -uno", ""),
Cmd("git checkout -f bleeding_edge", "", cb=ResetVersion(11, 4)),
Cmd("git checkout -f master", "", cb=ResetVersion(11, 4)),
Cmd("git pull", ""),
Cmd("git branch", ""),
Cmd("git checkout -f bleeding_edge", ""),
Cmd("git checkout -f master", ""),
Cmd("git log -1 --format=%H", "latest_hash"),
Cmd("git diff --name-only latest_hash latest_hash^", ""),
URL("https://v8-status.appspot.com/lkgr", "12345"),
Cmd("git checkout -f bleeding_edge", ""),
Cmd("git checkout -f master", ""),
Cmd(("git log --format=%H --grep="
"\"^git-svn-id: [^@]*@12345 [A-Za-z0-9-]*$\""),
"lkgr_hash"),
Cmd("git checkout -b auto-bump-up-version lkgr_hash", ""),
Cmd("git checkout -f bleeding_edge", ""),
Cmd("git branch", ""),
Cmd("git checkout -f master", ""),
Cmd("git branch", "auto-bump-up-version\n* master"),
Cmd("git branch -D auto-bump-up-version", ""),
Cmd("git diff --name-only lkgr_hash lkgr_hash^", ""),
Cmd("git checkout -f master", "", cb=ResetVersion(11, 5)),
Cmd("git checkout -f candidates", "", cb=ResetVersion(11, 5)),
Cmd("git pull", ""),
URL("https://v8-status.appspot.com/current?format=json",
"{\"message\": \"Tree is open\"}"),
Cmd("git checkout -b auto-bump-up-version bleeding_edge", "",
Cmd("git checkout -b auto-bump-up-version master", "",
cb=ResetVersion(11, 4)),
Cmd("git commit -am \"[Auto-roll] Bump up version to 3.11.6.0\n\n"
"TBR=author@chromium.org\" "
@ -1406,8 +1407,8 @@ git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3456 0039-1c4b
Cmd("git cl upload --send-mail --email \"author@chromium.org\" -f "
"--bypass-hooks", ""),
Cmd("git cl dcommit -f --bypass-hooks", ""),
Cmd("git checkout -f bleeding_edge", ""),
Cmd("git branch", "auto-bump-up-version\n* bleeding_edge"),
Cmd("git checkout -f master", ""),
Cmd("git branch", "auto-bump-up-version\n* master"),
Cmd("git branch -D auto-bump-up-version", ""),
]
self.Expect(expectations)
@ -1427,8 +1428,8 @@ git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3456 0039-1c4b
"--config-dir=[CONFIG_DIR] "
"-m \"[Auto-roll] Bump up version to 3.11.6.0\"",
"", cwd=svn_root),
Cmd("git checkout -f bleeding_edge", ""),
Cmd("git branch", "auto-bump-up-version\n* bleeding_edge"),
Cmd("git checkout -f master", ""),
Cmd("git branch", "auto-bump-up-version\n* master"),
Cmd("git branch -D auto-bump-up-version", ""),
]
self.Expect(expectations)