| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 | 5 |
| 6 import json | 6 import json |
| 7 import os | 7 import os |
| 8 import re | 8 import re |
| 9 import sys | 9 import sys |
| 10 | 10 |
| (...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 288 cmd=[git, 'reset', '--hard', repo.revision], | 288 cmd=[git, 'reset', '--hard', repo.revision], |
| 289 cwd=repo_path, | 289 cwd=repo_path, |
| 290 infra_step=True) | 290 infra_step=True) |
| 291 self.m.step('git clean', | 291 self.m.step('git clean', |
| 292 cmd=[git, 'clean', '-d', '-f'], | 292 cmd=[git, 'clean', '-d', '-f'], |
| 293 cwd=repo_path, | 293 cwd=repo_path, |
| 294 infra_step=True) | 294 infra_step=True) |
| 295 | 295 |
| 296 def checkout_steps(self): | 296 def checkout_steps(self): |
| 297 """Run the steps to obtain a checkout of Skia.""" | 297 """Run the steps to obtain a checkout of Skia.""" |
| 298 cfg_kwargs = {'GIT_MODE': True} | 298 cfg_kwargs = {} |
| 299 cfg_kwargs['GIT_MODE'] = True |
| 299 if not self.persistent_checkout: | 300 if not self.persistent_checkout: |
| 300 # We should've obtained the Skia checkout through isolates, so we don't | 301 # We should've obtained the Skia checkout through isolates, so we don't |
| 301 # need to perform the checkout ourselves. | 302 # need to perform the checkout ourselves. |
| 302 self.m.path['checkout'] = self.skia_dir | 303 self.m.path['checkout'] = self.skia_dir |
| 303 self.got_revision = self.m.properties['revision'] | 304 self.got_revision = self.m.properties['revision'] |
| 304 return | 305 return |
| 305 | 306 |
| 306 # Use a persistent gclient cache for Swarming. | 307 # Use a persistent gclient cache for Swarming. |
| 307 cfg_kwargs['CACHE_DIR'] = self.gclient_cache | 308 cfg_kwargs['CACHE_DIR'] = self.gclient_cache |
| 308 | 309 |
| (...skipping 574 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 883 # Don't bother to include role, which is always Test. | 884 # Don't bother to include role, which is always Test. |
| 884 # TryBots are uploaded elsewhere so they can use the same key. | 885 # TryBots are uploaded elsewhere so they can use the same key. |
| 885 blacklist = ['role', 'is_trybot'] | 886 blacklist = ['role', 'is_trybot'] |
| 886 | 887 |
| 887 flat = [] | 888 flat = [] |
| 888 for k in sorted(self.builder_cfg.keys()): | 889 for k in sorted(self.builder_cfg.keys()): |
| 889 if k not in blacklist: | 890 if k not in blacklist: |
| 890 flat.append(k) | 891 flat.append(k) |
| 891 flat.append(self.builder_cfg[k]) | 892 flat.append(self.builder_cfg[k]) |
| 892 return flat | 893 return flat |
| OLD | NEW |