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

[tools] Update auto-roller after renamed branch

Browse Source 
No-Try: true
Bug: chromium:1196558
Change-Id: Iffbf6de44caaea0215cbfe33fd28108e9ca4c715
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2808947
Reviewed-by: Liviu Rau <liviurau@chromium.org>
Commit-Queue: Michael Achenbach <machenbach@chromium.org>
Cr-Commit-Position: refs/heads/master@{#73859}
This commit is contained in:
Michael Achenbach 2021-04-07 13:56:22 +02:00 committed by Commit Bot
parent d5457f5fb7
commit 9e391185da
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/release/auto_roll.py
View File

@ -126,7 +126,7 @@ class UpdateChromiumCheckout(Step):
def RunStep(self):
self['json_output']['monitoring_state'] = 'update_chromium'
cwd = self._options.chromium
self.GitCheckout("master", cwd=cwd)
self.GitCheckout("main", cwd=cwd)
self.DeleteBranch("work-branch", cwd=cwd)
self.GitPull(cwd=cwd)
@ -168,7 +168,7 @@ class UploadCL(Step):
else:
print("Dry run - don't upload.")
self.GitCheckout("master", cwd=cwd)
self.GitCheckout("main", cwd=cwd)
self.GitDeleteBranch("work-branch", cwd=cwd)
class CleanUp(Step):

4
tools/release/test_scripts.py
View File

@ -612,7 +612,7 @@ deps = {
Cmd("git describe --tags roll_hsh", "3.22.4"),
Cmd("git describe --tags last_roll_hsh", "3.22.2.1"),
Cmd("git status -s -uno", "", cwd=chrome_dir),
Cmd("git checkout -f master", "", cwd=chrome_dir),
Cmd("git checkout -f main", "", cwd=chrome_dir),
Cmd("git branch", "", cwd=chrome_dir),
Cmd("git pull", "", cwd=chrome_dir),
Cmd("git fetch origin", ""),
@ -626,7 +626,7 @@ deps = {
Cmd("git cl upload --send-mail -f "
"--cq-dry-run --set-bot-commit --bypass-hooks", "",
cwd=chrome_dir),
Cmd("git checkout -f master", "", cwd=chrome_dir),
Cmd("git checkout -f main", "", cwd=chrome_dir),
Cmd("git branch -D work-branch", "", cwd=chrome_dir),
]
self.Expect(expectations)