Commit 29ec319f authored by Michael Achenbach's avatar Michael Achenbach Committed by Commit Bot

Revert "[release] Replace raw DEPS processing with gclient getdep"

This reverts commit 0ba1c23c.

Reason for revert: Doesn't work yet

Original change's description:
> [release] Replace raw DEPS processing with gclient getdep
> 
> No-Try: true
> Bug: chromium:1106435
> Change-Id: I120d3930e4e8be7010d8d1f1928829ca0882638d
> Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2304578
> Reviewed-by: Tamer Tas <tmrts@chromium.org>
> Commit-Queue: Michael Achenbach <machenbach@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#68913}

TBR=machenbach@chromium.org,tmrts@chromium.org,liviurau@chromium.org

Change-Id: I76e02bfa50fdc5967ab72784cd71114bb82b7261
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: chromium:1106435
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2304585Reviewed-by: 's avatarMichael Achenbach <machenbach@chromium.org>
Commit-Queue: Michael Achenbach <machenbach@chromium.org>
Cr-Commit-Position: refs/heads/master@{#68914}
parent 0ba1c23c
......@@ -46,10 +46,14 @@ class DetectLastRoll(Step):
self['json_output']['monitoring_state'] = 'detect_last_roll'
self["last_roll"] = self._options.last_roll
if not self["last_roll"]:
# Get last-rolled v8 revision from Chromium's DEPS file.
self["last_roll"] = self.Command(
"gclient", "getdep -r src/v8", cwd=self._options.chromium).strip()
# Interpret the DEPS file to retrieve the v8 revision.
# TODO(machenbach): This should be part or the setdep api of
# depot_tools.
Var = lambda var: '%s'
exec(FileToText(os.path.join(self._options.chromium, "DEPS")))
# The revision rolled last.
self["last_roll"] = vars['v8_revision']
self["last_version"] = self.GetVersionTag(self["last_roll"])
assert self["last_version"], "The last rolled v8 revision is not tagged."
......
......@@ -558,11 +558,9 @@ deps = {
TEST_CONFIG["CHROMIUM"] = self.MakeEmptyTempDirectory()
json_output_file = os.path.join(TEST_CONFIG["CHROMIUM"], "out.json")
TextToFile(self.FAKE_DEPS, os.path.join(TEST_CONFIG["CHROMIUM"], "DEPS"))
chrome_dir = TEST_CONFIG["CHROMIUM"]
self.Expect([
Cmd("git fetch origin", ""),
Cmd("git fetch origin +refs/tags/*:refs/tags/*", ""),
Cmd("gclient getdep -r src/v8", "last_roll_hsh", cwd=chrome_dir),
Cmd("git describe --tags last_roll_hsh", "3.22.4"),
Cmd("git fetch origin +refs/tags/*:refs/tags/*", ""),
Cmd("git rev-list --max-age=395200 --tags",
......@@ -599,7 +597,6 @@ deps = {
expectations = [
Cmd("git fetch origin", ""),
Cmd("git fetch origin +refs/tags/*:refs/tags/*", ""),
Cmd("gclient getdep -r src/v8", "last_roll_hsh", cwd=chrome_dir),
Cmd("git describe --tags last_roll_hsh", "3.22.3.1"),
Cmd("git fetch origin +refs/tags/*:refs/tags/*", ""),
Cmd("git rev-list --max-age=395200 --tags",
......
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