Fix chromium update in auto-roller.

BUG=
R=hinoka@google.com

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

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@23455 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent d806fef1
...@@ -73,6 +73,12 @@ class UpdateChromiumCheckout(Step): ...@@ -73,6 +73,12 @@ class UpdateChromiumCheckout(Step):
os.chdir(self["chrome_path"]) os.chdir(self["chrome_path"])
self.GitCheckout("master") self.GitCheckout("master")
self._side_effect_handler.Command("gclient", "sync --nohooks") self._side_effect_handler.Command("gclient", "sync --nohooks")
try:
# TODO(machenbach): Add cwd to git calls.
os.chdir(os.path.join(self["chrome_path"], "v8"))
self.GitFetchOrigin()
finally:
os.chdir(self["chrome_path"])
self.GitCreateBranch("v8-roll-%s" % self["trunk_revision"]) self.GitCreateBranch("v8-roll-%s" % self["trunk_revision"])
......
...@@ -834,6 +834,8 @@ def get_list(): ...@@ -834,6 +834,8 @@ def get_list():
TEST_CONFIG[DOT_GIT_LOCATION] = self.MakeEmptyTempFile() TEST_CONFIG[DOT_GIT_LOCATION] = self.MakeEmptyTempFile()
if not os.path.exists(TEST_CONFIG[CHROMIUM]): if not os.path.exists(TEST_CONFIG[CHROMIUM]):
os.makedirs(TEST_CONFIG[CHROMIUM]) os.makedirs(TEST_CONFIG[CHROMIUM])
if not os.path.exists(os.path.join(TEST_CONFIG[CHROMIUM], "v8")):
os.makedirs(os.path.join(TEST_CONFIG[CHROMIUM], "v8"))
TextToFile("Some line\n \"v8_revision\": \"123444\",\n some line", TextToFile("Some line\n \"v8_revision\": \"123444\",\n some line",
TEST_CONFIG[DEPS_FILE]) TEST_CONFIG[DEPS_FILE])
def WriteDeps(): def WriteDeps():
...@@ -855,6 +857,7 @@ def get_list(): ...@@ -855,6 +857,7 @@ def get_list():
Git("status -s -uno", ""), Git("status -s -uno", ""),
Git("checkout -f master", ""), Git("checkout -f master", ""),
Git("sync --nohooks", "syncing..."), Git("sync --nohooks", "syncing..."),
Git("fetch origin", ""),
Git("checkout -b v8-roll-123455", ""), Git("checkout -b v8-roll-123455", ""),
Git("v8 123455", "rolled", cb=WriteDeps), Git("v8 123455", "rolled", cb=WriteDeps),
Git(("commit -am \"Update V8 to version 3.22.5 " Git(("commit -am \"Update V8 to version 3.22.5 "
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment