Commit ccfa4ca7 authored by Yang Guo's avatar Yang Guo Committed by Commit Bot

[node] reset node checkout on v8 update

This is a temporary measure to get bots back in order.

Bug: chromium:860430

TBR=machenbach@chromium.org

Change-Id: I3275150f4bc5dfe8ab90984e15f8a1a469d70caf
Reviewed-on: https://chromium-review.googlesource.com/1127166Reviewed-by: 's avatarYang Guo <yangguo@chromium.org>
Commit-Queue: Yang Guo <yangguo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#54269}
parent 347ea653
...@@ -81,6 +81,12 @@ def CommitPatch(options): ...@@ -81,6 +81,12 @@ def CommitPatch(options):
cwd=options.v8_path, cwd=options.v8_path,
) )
def ResetTarget(path):
"""Temporarily use this to clear the checkout on the bots"""
print ">> Resetting Node.js checkout"
subprocess.check_call(["git", "reset", "--hard"], cwd=path)
subprocess.check_call(["git", "clean", "-fxd"], cwd=path)
def UpdateTarget(repository, options, files_to_keep): def UpdateTarget(repository, options, files_to_keep):
source = os.path.join(options.v8_path, *repository) source = os.path.join(options.v8_path, *repository)
target = os.path.join(options.node_path, TARGET_SUBDIR, *repository) target = os.path.join(options.node_path, TARGET_SUBDIR, *repository)
...@@ -168,6 +174,7 @@ def Main(args): ...@@ -168,6 +174,7 @@ def Main(args):
if options.gclient: if options.gclient:
RunGclient(options.v8_path) RunGclient(options.v8_path)
# Commit patch on trybots to main V8 repository. # Commit patch on trybots to main V8 repository.
ResetTarget(options.node_path)
if options.with_patch: if options.with_patch:
CommitPatch(options) CommitPatch(options)
# Update main V8 repository. # Update main V8 repository.
......
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