diff options
author | 2017-03-24 17:28:27 -0700 | |
---|---|---|
committer | 2017-03-27 12:30:50 +0000 | |
commit | 1af55b9a99af275c225be55c975f8d8dbb697d27 (patch) | |
tree | 37114e5f96ddcf27d14fde7f4fdbe0779a70f028 /infra | |
parent | ad1de45fa55676f96434c0c7440c86d7b38af79b (diff) |
Manually roll recipes
Removes unused recipe expectation.
build:
https://crrev.com/e0f3d95ef043b98fcceb1f34b03f9b8fac091eb9 Roll recipe dependencies (trivial).
depot_tools:
https://crrev.com/0bbe6fa00ef873080c4f6d145ea7a00497eeed3f Roll recipe dependencies (trivial).
recipe_engine:
https://crrev.com/e300f3a3b8193b84b88599faa30c0301e155c906 Handle unused recipe expectations in new 'test' command
Bug: skia:
Change-Id: I3f00821de5b7f5158c6da2ff1206f2e1ec133e0f
Reviewed-on: https://skia-review.googlesource.com/10124
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
Diffstat (limited to 'infra')
-rw-r--r-- | infra/bots/recipes/presubmit.expected/presubmit.json | 134 | ||||
-rw-r--r-- | infra/config/recipes.cfg | 6 |
2 files changed, 3 insertions, 137 deletions
diff --git a/infra/bots/recipes/presubmit.expected/presubmit.json b/infra/bots/recipes/presubmit.expected/presubmit.json deleted file mode 100644 index 1c2751d9b4..0000000000 --- a/infra/bots/recipes/presubmit.expected/presubmit.json +++ /dev/null @@ -1,134 +0,0 @@ -[ - { - "cmd": [ - "python", - "-u", - "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[CUSTOM_/_B_WORK]", - "511" - ], - "name": "makedirs checkout_path", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import sys, os@@@", - "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@", - "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@", - "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@", - "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@", - "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", - "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "config", - "--spec", - "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient setup" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "sync", - "--verbose", - "--with_branch_heads", - "--nohooks", - "-j8", - "--reset", - "--force", - "--upstream", - "--no-nag-max", - "--delete_unversioned_trees", - "--revision", - "skia@abc123", - "--output-json", - "/path/to/tmp/json" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient sync", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"revision\": \"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", - "@@@STEP_LOG_LINE@json.output@ }@@@", - "@@@STEP_LOG_LINE@json.output@ }@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@", - "@@@SET_BUILD_PROPERTY@got_revision@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.name", - "local_bot" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient recurse (git config user.name)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.email", - "local_bot@example.com" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient recurse (git config user.email)" - }, - { - "cmd": [ - "python", - "PRESUBMIT.py" - ], - "name": "presubmit" - }, - { - "name": "$result", - "recipe_result": null, - "status_code": 0 - } -]
\ No newline at end of file diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg index 85559809b4..8638036cc5 100644 --- a/infra/config/recipes.cfg +++ b/infra/config/recipes.cfg @@ -5,17 +5,17 @@ deps { project_id: "build" url: "https://chromium.googlesource.com/chromium/tools/build.git" branch: "master" - revision: "6e47d11dafc3ca058652d7c93a60080462f0961e" + revision: "e0f3d95ef043b98fcceb1f34b03f9b8fac091eb9" } deps { project_id: "depot_tools" url: "https://chromium.googlesource.com/chromium/tools/depot_tools.git" branch: "master" - revision: "e86f6de84296601c61a3d3e6d7655e596535c4d6" + revision: "0bbe6fa00ef873080c4f6d145ea7a00497eeed3f" } deps { project_id: "recipe_engine" url: "https://chromium.googlesource.com/external/github.com/luci/recipes-py.git" branch: "master" - revision: "78f105cbebb6e8dc99d64638d400868851cb0c40" + revision: "e300f3a3b8193b84b88599faa30c0301e155c906" } |