admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert of Add a DEPS gclient hook to prune corrupt mockito remote. (patchset #1 id:1 of https://codereview.webrtc.org/2326523002/ )

Browse Source 
Reason for revert:
Unfortunately this didn't help, so I'm reverting this to clean things up for now.

Original issue's description:
> Add a DEPS gclient hook to prune corrupt mockito remote.
>
> A third_party remote for third_party/mockito/src is corrupt. Run
> `git remote prune origin` in the checkout directory before syncing
> Chromium.
>
> Thanks to slan@ for providing this fix.
>
> TBR=kjellander@webrtc.org
> BUG=chromium:644722
> NOTRY=True
>
> Committed: https://crrev.com/3115b06957d5b8cba5d45cebc301795e94a926ec
> Cr-Commit-Position: refs/heads/master@{#14138}

TBR=ehmaldonado@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=chromium:644722

Review-Url: https://codereview.webrtc.org/2326473003
Cr-Commit-Position: refs/heads/master@{#14143}
This commit is contained in:
kjellander 2016-09-08 10:55:42 -07:00 committed by Commit bot
parent 5865f48dcb
commit 432950cab2
3 changed files with 1 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
DEPS
View File

@ -34,17 +34,6 @@ hooks = [
'_ = os.system("%s %s" % (sys.executable,script)) '
'if os.path.exists(script) else 0')],
},
{
# TODO(kjellander): Remove when (crbug.com/644722 is fixed.
# This prunes origin for the mockito repo, which has some conflicting refs
# in the remote.
'name': 'local_prune_mockito_refs',
'pattern': '.',
'action': [
'python',
'src/webrtc/build/prune_third_party_mockito_origin.py'
],
},
{
# Clone chromium and its deps.
'name': 'sync chromium',

2
sync_chromium.py
View File

@ -31,7 +31,7 @@ import textwrap
# Bump this whenever the algorithm changes and you need bots/devs to re-sync,
# ignoring the .last_sync_chromium file
SCRIPT_VERSION = 9
SCRIPT_VERSION = 8
ROOT_DIR = os.path.dirname(os.path.abspath(__file__))
CHROMIUM_NO_HISTORY = 'CHROMIUM_NO_HISTORY'

33
webrtc/build/prune_third_party_mockito_origin.py
View File

@ -1,33 +0,0 @@
#!/usr/bin/env python
# Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
#
# Use of this source code is governed by a BSD-style license
# that can be found in the LICENSE file in the root of the source
# tree. An additional intellectual property rights grant can be found
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
# Used to work around an upstream bug (crbug.com/644722).
# This file will be removed ASAP.
import os
import subprocess
import sys
# Path to the corrupt project.
MOCKITO_CHECKOUT_PATH = 'src/third_party/mockito/src'
def main():
# If this checkout exists, run `git remote prune origin` from it.
if os.path.isdir(MOCKITO_CHECKOUT_PATH):
subprocess.check_output(
['git', 'remote', 'prune', 'origin'], cwd=MOCKITO_CHECKOUT_PATH)
else:
sys.stdout.write('{} does not exist!\n'.format(MOCKITO_CHECKOUT_PATH))
return 0
if __name__ == '__main__':
sys.exit(main())