AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Do not checkout skia from chromium.googlesource.com in RecreateSKPs bot

Browse Source 
It appears to be confusing "git cl upload".

BUG=skia:6033

Change-Id: I9813798dbfbbdb9eba6f4159f07e040ac865006c
Reviewed-on: https://skia-review.googlesource.com/5601
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Ravi Mistry <rmistry@google.com>
This commit is contained in:
Ravi Mistry 2016-12-06 08:14:12 -05:00 committed by Skia Commit-Bot
parent 2afffbda66
commit e7d34b1d2c
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
infra/bots/upload_skps.py
View File

@ -13,7 +13,6 @@ import urllib2
import git_utils
CHROMIUM_SKIA = 'https://chromium.googlesource.com/skia.git'
SKIA_COMMITTER_EMAIL = 'update-skps@skia.org'
SKIA_COMMITTER_NAME = 'UpdateSKPs'
COMMIT_MSG = '''Update SKP version
@ -27,11 +26,7 @@ SKIA_REPO = 'https://skia.googlesource.com/skia.git'
def main(target_dir, gitcookies):
with git_utils.NewGitCheckout(repository=CHROMIUM_SKIA):
if CHROMIUM_SKIA in subprocess.check_output(['git', 'remote', '-v']):
subprocess.check_call(['git', 'remote', 'set-url', 'origin', SKIA_REPO,
CHROMIUM_SKIA])
with git_utils.NewGitCheckout(repository=SKIA_REPO):
# Download CIPD.
cipd_sha1 = os.path.join(os.getcwd(), 'infra', 'bots', 'tools', 'luci-go',
'linux64', 'cipd.sha1')