Roll recipe dependencies (trivial). This is an automated CL created by the recipe roller. This CL rolls recipe changes from upstream projects (depot_tools, fuchsia) into this repository. The build that created this CL was https://ci.chromium.org/b/8782530773882988289 depot_tools: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/9acd55ea89dcc7e3bfe03ff69ea27b62ca8c97bd~..afb5f0e3d3723086856c5cc03c409abafdb62b0d 9acd55e (bryner@google.com) Have fake_cipd accept 'export' in addition to 'ensure'. 0ddbf02 (sokcevic@chromium.org) [py3] Run gclient git test with py3 afb5f0e (sokcevic@chromium.org) Drop explicit PRESUBMIT py2 test fuchsia: https://fuchsia.googlesource.com/infra/recipes.git/+log/616cc8b1872a5f09b0bd71f1ade89836c92a03de~..ccab8395923d287a0d4a2ed022f767f649dda8db 616cc8b (phosek@google.com) [clang_toolchain] Avoid overwriting cas_digest ccab839 (computerdruid@google.com) Revert "[rust_toolchain] Include Fuchsia RISC-V runtimes" Please check the following references for more information: - autoroller, https://chromium.googlesource.com/infra/luci/recipes-py/+/main/doc/workflow.md#autoroller - rollback, https://chromium.googlesource.com/infra/luci/recipes-py/+/main/doc/workflow.md#rollback - cross-repo dependencies, https://chromium.googlesource.com/infra/luci/recipes-py/+/main/doc/cross_repo.md Use https://goo.gl/noib3a to file a bug. R=flutter-infra@grotations.appspotmail.com Recipe-Tryjob-Bypass-Reason: Autoroller Ignore-Freeze: Autoroller Bugdroid-Send-Email: False Change-Id: I751fd2a184ed7ee39440430b2e67c0919d54e951 Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/43400 Bot-Commit: flutter-prod-builder@chops-service-accounts.iam.gserviceaccount.com <flutter-prod-builder@chops-service-accounts.iam.gserviceaccount.com> Commit-Queue: flutter-prod-builder@chops-service-accounts.iam.gserviceaccount.com <flutter-prod-builder@chops-service-accounts.iam.gserviceaccount.com>
diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg index e0f2653..38634c4 100644 --- a/infra/config/recipes.cfg +++ b/infra/config/recipes.cfg
@@ -23,12 +23,12 @@ "deps": { "depot_tools": { "branch": "refs/heads/main", - "revision": "ddd8578dbe7a8c12a756ebe0c54268b6fef5436d", + "revision": "afb5f0e3d3723086856c5cc03c409abafdb62b0d", "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git" }, "fuchsia": { "branch": "refs/heads/main", - "revision": "0c53f2c3f664b9b32f0d4eaa481ce3d982319e38", + "revision": "ccab8395923d287a0d4a2ed022f767f649dda8db", "url": "https://fuchsia.googlesource.com/infra/recipes.git" }, "recipe_engine": {
diff --git a/recipes.py b/recipes.py index 94232fd..7c534c2 100755 --- a/recipes.py +++ b/recipes.py
@@ -11,10 +11,8 @@ # This little shell hack is a triple-quoted noop in python, but in sh it # evaluates to re-exec'ing this script in unbuffered mode. # pylint: disable=pointless-string-statement - ''''exec python3 -u -- "$0" ${1+"$@"} # ''' # vi: syntax=python - """Bootstrap script to clone and forward to the recipe engine tool. ******************* @@ -81,9 +79,8 @@ try: if pb['api_version'] != 2: - raise MalformedRecipesCfg( - 'unknown version %d' % pb['api_version'], recipes_cfg_path - ) + raise MalformedRecipesCfg('unknown version %d' % pb['api_version'], + recipes_cfg_path) # If we're running ./recipes.py from the recipe_engine repo itself, then # return None to signal that there's no EngineDep. @@ -98,8 +95,7 @@ if 'url' not in engine: raise MalformedRecipesCfg( 'Required field "url" in dependency "recipe_engine" not found', - recipes_cfg_path - ) + recipes_cfg_path) engine.setdefault('revision', '') engine.setdefault('branch', 'refs/heads/main') @@ -109,9 +105,8 @@ if not engine['branch'].startswith('refs/'): engine['branch'] = 'refs/heads/' + engine['branch'] - recipes_path = os.path.join( - repo_root, recipes_path.replace('/', os.path.sep) - ) + recipes_path = os.path.join(repo_root, + recipes_path.replace('/', os.path.sep)) return EngineDep(**engine), recipes_path, py3_only except KeyError as ex: raise MalformedRecipesCfg(str(ex), recipes_cfg_path) @@ -218,9 +213,8 @@ os.remove(index_lock) except OSError as exc: if exc.errno != errno.ENOENT: - logging.warn( - 'failed to remove %r, reset will fail: %s', index_lock, exc - ) + logging.warn('failed to remove %r, reset will fail: %s', index_lock, + exc) _git_check_call(['reset', '-q', '--hard', revision], cwd=engine_path) # If the engine has refactored/moved modules we need to clean all .pyc files @@ -244,20 +238,16 @@ if recipes_cfg_path: # calculate repo_root from recipes_cfg_path repo_root = os.path.dirname( - os.path.dirname(os.path.dirname(recipes_cfg_path)) - ) + os.path.dirname(os.path.dirname(recipes_cfg_path))) else: # find repo_root with git and calculate recipes_cfg_path repo_root = ( _git_output(['rev-parse', '--show-toplevel'], - cwd=os.path.abspath(os.path.dirname(__file__))).strip() - ) + cwd=os.path.abspath(os.path.dirname(__file__))).strip()) repo_root = os.path.abspath(repo_root).decode() recipes_cfg_path = os.path.join(repo_root, 'infra', 'config', 'recipes.cfg') args = ['--package', recipes_cfg_path] + args - engine_path, py3_only = checkout_engine( - engine_override, repo_root, recipes_cfg_path - ) + engine_path, py3_only = checkout_engine(engine_override, repo_root, recipes_cfg_path) using_py3 = py3_only or os.getenv('RECIPES_USE_PY3') == 'true' vpython = ('vpython' + ('3' if using_py3 else '') + _BAT) @@ -265,9 +255,7 @@ return 'Required binary is not found on PATH: %s' % vpython argv = ([ - vpython, - '-u', - os.path.join(engine_path, 'recipe_engine', 'main.py'), + vpython, '-u', os.path.join(engine_path, 'recipe_engine', 'main.py'), ] + args) if IS_WIN: