Commit fffffd5d authored by Dan Elphick's avatar Dan Elphick Committed by Commit Bot

Fix WATCHLISTS being reverted in rolls

Don't overwrite WATCHLISTS each time with a checkout from the latest
release branch as that means it will never pick up changes from
master.

No-Try: true
Bug: chromium:832032
Change-Id: I3a9231369caa9a6591acb9b7f0c76dc031ab9178
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1926029
Commit-Queue: Dan Elphick <delphick@chromium.org>
Reviewed-by: 's avatarMichael Achenbach <machenbach@chromium.org>
Cr-Commit-Position: refs/heads/master@{#65063}
parent ea63ba98
...@@ -169,7 +169,6 @@ class MakeBranch(Step): ...@@ -169,7 +169,6 @@ class MakeBranch(Step):
self.Git("new-branch work-branch --upstream origin/%s" % self["version"]) self.Git("new-branch work-branch --upstream origin/%s" % self["version"])
self.GitCheckoutFile(CHANGELOG_FILE, self["latest_version"]) self.GitCheckoutFile(CHANGELOG_FILE, self["latest_version"])
self.GitCheckoutFile(VERSION_FILE, self["latest_version"]) self.GitCheckoutFile(VERSION_FILE, self["latest_version"])
self.GitCheckoutFile(WATCHLISTS_FILE, self["latest_version"])
class AddChangeLog(Step): class AddChangeLog(Step):
......
...@@ -913,7 +913,7 @@ TBR=reviewer@chromium.org""" ...@@ -913,7 +913,7 @@ TBR=reviewer@chromium.org"""
expectations = [ expectations = [
Cmd("git fetch origin +refs/heads/*:refs/heads/*", ""), Cmd("git fetch origin +refs/heads/*:refs/heads/*", ""),
Cmd("git checkout -f origin/master", ""), Cmd("git checkout -f origin/master", "", cb=self.WriteFakeWatchlistsFile),
Cmd("git branch", ""), Cmd("git branch", ""),
Cmd("git fetch origin +refs/tags/*:refs/tags/*", ""), Cmd("git fetch origin +refs/tags/*:refs/tags/*", ""),
Cmd("git tag", self.TAGS), Cmd("git tag", self.TAGS),
...@@ -933,8 +933,6 @@ TBR=reviewer@chromium.org""" ...@@ -933,8 +933,6 @@ TBR=reviewer@chromium.org"""
Cmd("git checkout -f 3.22.4 -- ChangeLog", "", cb=ResetChangeLog), Cmd("git checkout -f 3.22.4 -- ChangeLog", "", cb=ResetChangeLog),
Cmd("git checkout -f 3.22.4 -- include/v8-version.h", "", Cmd("git checkout -f 3.22.4 -- include/v8-version.h", "",
cb=self.WriteFakeVersionFile), cb=self.WriteFakeVersionFile),
Cmd("git checkout -f 3.22.4 -- WATCHLISTS", "",
cb=self.WriteFakeWatchlistsFile),
Cmd("git commit -aF \"%s\"" % TEST_CONFIG["COMMITMSG_FILE"], "", Cmd("git commit -aF \"%s\"" % TEST_CONFIG["COMMITMSG_FILE"], "",
cb=CheckVersionCommit), cb=CheckVersionCommit),
Cmd("git cl upload --send-mail " Cmd("git cl upload --send-mail "
......
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