Commit 90e61da1 authored by Michael Achenbach's avatar Michael Achenbach Committed by Commit Bot

Reland "[release] Switch auto-roller to gclient setdep"

This reverts commit d169622f.

Reason for revert: setdep bug should be fixed

Original change's description:
> Revert "[release] Switch auto-roller to gclient setdep"
> 
> This reverts commit a9f5dd30.
> 
> Reason for revert:
> Temporarily use legacy method until https://crbug.com/843917 is fixed.
> 
> Original change's description:
> > [release] Switch auto-roller to gclient setdep
> > 
> > NOTRY=true
> > 
> > Bug: chromium:828745
> > Change-Id: I051f57893937796e01f0b823f1050dd36e0fbfd9
> > Reviewed-on: https://chromium-review.googlesource.com/997556
> > Reviewed-by: Sergiy Byelozyorov <sergiyb@chromium.org>
> > Commit-Queue: Michael Achenbach <machenbach@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#52385}
> 
> TBR=machenbach@chromium.org,hablich@chromium.org,sergiyb@chromium.org
> 
> NOTRY=true
> 
> Bug: chromium:843917
> Change-Id: I69978ba55ffa5996101e1d31bdf10364b7ef273f
> Reviewed-on: https://chromium-review.googlesource.com/1064130
> Reviewed-by: Michael Achenbach <machenbach@chromium.org>
> Commit-Queue: Michael Achenbach <machenbach@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#53230}

TBR=machenbach@chromium.org,hablich@chromium.org,sergiyb@chromium.org

Change-Id: Ia70dc1df7e25e0c8ffd3fafeb97830b5d5f87336
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: chromium:843917
Reviewed-on: https://chromium-review.googlesource.com/1064413Reviewed-by: 's avatarMichael Achenbach <machenbach@chromium.org>
Commit-Queue: Michael Achenbach <machenbach@chromium.org>
Cr-Commit-Position: refs/heads/master@{#53238}
parent e24dd868
......@@ -40,7 +40,7 @@ class DetectLastRoll(Step):
self["last_roll"] = self._options.last_roll
if not self["last_roll"]:
# Interpret the DEPS file to retrieve the v8 revision.
# TODO(machenbach): This should be part or the roll-deps api of
# 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")))
......@@ -140,7 +140,7 @@ class UploadCL(Step):
self['json_output']['monitoring_state'] = 'upload'
cwd = self._options.chromium
# Patch DEPS file.
if self.Command("roll-dep-svn", "v8 %s" %
if self.Command("gclient", "setdep -r src/v8@%s" %
self["roll"], cwd=cwd) is None:
self.Die("Failed to create deps for %s" % self["roll"])
......
......@@ -1079,7 +1079,8 @@ deps = {
Cmd("git pull", "", cwd=chrome_dir),
Cmd("git fetch origin", ""),
Cmd("git new-branch work-branch", "", cwd=chrome_dir),
Cmd("roll-dep-svn v8 roll_hsh", "rolled", cb=WriteDeps, cwd=chrome_dir),
Cmd("gclient setdep -r src/v8@roll_hsh", "", cb=WriteDeps,
cwd=chrome_dir),
Cmd(("git commit -am \"%s\" "
"--author \"author@chromium.org <author@chromium.org>\"" %
self.ROLL_COMMIT_MSG),
......
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