diff options
| author |  Eric Boren <borenet@google.com> | 2018-06-20 08:19:24 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-20 13:55:18 +0000 |
| commit | ea290808b06f87487fad3f191bf7c2c95c4cb82d (patch) | |
| tree | d367ffb3349e5dec17b630a88d468fde5ed351bc | |
| parent | b056e7f77f380d8f32490e164cbdbb642f6d76c9 (diff) | |
Add Chromium to DEPS for CommandBuffer bots
Bug: skia:6951
Change-Id: I094b542c6930e0789db71474650235b3ce991054
Reviewed-on: https://skia-review.googlesource.com/136022
Reviewed-by: Ravi Mistry <rmistry@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
8 files changed, 41 insertions, 53 deletions
@@ -1,5 +1,9 @@ use_relative_paths = True +vars = { + "checkout_chromium": False, +} + deps = { "buildtools" : "https://chromium.googlesource.com/chromium/buildtools.git@505de88083136eefd056e5ee4ca0f01fe9b33de8", "common" : "https://skia.googlesource.com/common.git@9737551d7a52c3db3262db5856e6bcd62c462b92", @@ -30,6 +34,14 @@ deps = { "third_party/externals/zlib" : "https://chromium.googlesource.com/chromium/src/third_party/zlib@e7afdfe128e01ca480a28f757b571957befdd962", "third_party/externals/Nima-Cpp" : "https://github.com/2d-inc/Nima-Cpp.git@4bd02269d7d1d2e650950411325eafa15defb084", "third_party/externals/Nima-Math-Cpp" : "https://github.com/2d-inc/Nima-Math-Cpp.git@e0c12772093fa8860f55358274515b86885f0108", + + "../src": { + "url": "https://chromium.googlesource.com/chromium/src.git@46931e2df7ad0925086b34329cc83479dd0fb31c", + "condition": "checkout_chromium", + }, } -recursedeps = [ "common" ] +recursedeps = [ + "common", + "../src", +] diff --git a/infra/bots/recipe_modules/checkout/api.py b/infra/bots/recipe_modules/checkout/api.py index f520c5b0a3..f2f6560734 100644 --- a/infra/bots/recipe_modules/checkout/api.py +++ b/infra/bots/recipe_modules/checkout/api.py @@ -71,17 +71,7 @@ class CheckoutApi(recipe_api.RecipeApi): # Initial cleanup. gclient_cfg = self.m.gclient.make_config(**cfg_kwargs) - # Add chromium first because of skbug.com/7917. - if checkout_chromium: - chromium = gclient_cfg.solutions.add() - chromium.name = 'src' - chromium.managed = False - chromium.url = 'https://chromium.googlesource.com/chromium/src.git' - chromium.revision = 'origin/master' - extra_gclient_env['GYP_CHROMIUM_NO_ACTION'] = '0' - main_repo = self.m.properties['repository'] - if checkout_flutter: main_repo = 'https://github.com/flutter/engine.git' main_name = self.m.path.basename(main_repo) @@ -122,6 +112,10 @@ class CheckoutApi(recipe_api.RecipeApi): patch_repo = 'https://skia.googlesource.com/skia.git' patch_root = skia_dep_path + if checkout_chromium: + main.custom_vars['checkout_chromium'] = True + extra_gclient_env['GYP_CHROMIUM_NO_ACTION'] = '0' + # TODO(rmistry): Remove the below block after there is a solution for # crbug.com/616443 entries_file = checkout_root.join('.gclient_entries') diff --git a/infra/bots/recipe_modules/checkout/examples/full.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json b/infra/bots/recipe_modules/checkout/examples/full.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json index 96c67b4135..e9b5d59e16 100644 --- a/infra/bots/recipe_modules/checkout/examples/full.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json +++ b/infra/bots/recipe_modules/checkout/examples/full.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json @@ -33,7 +33,7 @@ "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", - "cache_dir = '[START_DIR]/cache/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}, {'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", + "cache_dir = '[START_DIR]/cache/git'\nsolutions = [{'custom_vars': {'checkout_chromium': True}, 'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", "--revision_mapping_file", @@ -45,9 +45,7 @@ "--output_json", "/path/to/tmp/json", "--revision", - "skia@abc123", - "--revision", - "src@origin/master" + "skia@abc123" ], "cwd": "[START_DIR]/cache/work", "env_prefixes": { @@ -62,8 +60,7 @@ "@@@STEP_LOG_LINE@json.output@{@@@", "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@", "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia\": \"abc123\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"src\": \"origin/master\"@@@", + "@@@STEP_LOG_LINE@json.output@ \"skia\": \"abc123\"@@@", "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"skia\": {@@@", @@ -77,7 +74,7 @@ "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"9046e2e693bb92a76e972b694580e5d17ad10748\", @@@", "@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master@{#164710}\"@@@", "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"root\": \"skia\", @@@", "@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"skia\": {@@@", diff --git a/infra/bots/recipe_modules/checkout/examples/full.expected/Housekeeper-Weekly-RecreateSKPs.json b/infra/bots/recipe_modules/checkout/examples/full.expected/Housekeeper-Weekly-RecreateSKPs.json index ea50f858a3..8bc63364d1 100644 --- a/infra/bots/recipe_modules/checkout/examples/full.expected/Housekeeper-Weekly-RecreateSKPs.json +++ b/infra/bots/recipe_modules/checkout/examples/full.expected/Housekeeper-Weekly-RecreateSKPs.json @@ -33,7 +33,7 @@ "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", - "cache_dir = '[START_DIR]/cache/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}, {'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", + "cache_dir = '[START_DIR]/cache/git'\nsolutions = [{'custom_vars': {'checkout_chromium': True}, 'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", "--revision_mapping_file", @@ -45,9 +45,7 @@ "--output_json", "/path/to/tmp/json", "--revision", - "skia@abc123", - "--revision", - "src@origin/master" + "skia@abc123" ], "cwd": "[START_DIR]/cache/work", "env_prefixes": { @@ -62,8 +60,7 @@ "@@@STEP_LOG_LINE@json.output@{@@@", "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@", "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia\": \"abc123\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"src\": \"origin/master\"@@@", + "@@@STEP_LOG_LINE@json.output@ \"skia\": \"abc123\"@@@", "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"skia\": {@@@", @@ -77,7 +74,7 @@ "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"9046e2e693bb92a76e972b694580e5d17ad10748\", @@@", "@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master@{#164710}\"@@@", "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"root\": \"skia\", @@@", "@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"skia\": {@@@", diff --git a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json index a9669f013b..c918a736b4 100644 --- a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json +++ b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json @@ -33,7 +33,7 @@ "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", - "cache_dir = '[START_DIR]/cache/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}, {'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", + "cache_dir = '[START_DIR]/cache/git'\nsolutions = [{'custom_vars': {'checkout_chromium': True}, 'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", "--revision_mapping_file", @@ -45,9 +45,7 @@ "--output_json", "/path/to/tmp/json", "--revision", - "skia@abc123", - "--revision", - "src@origin/master" + "skia@abc123" ], "cwd": "[START_DIR]/cache/work", "env_prefixes": { @@ -62,8 +60,7 @@ "@@@STEP_LOG_LINE@json.output@{@@@", "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@", "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia\": \"abc123\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"src\": \"origin/master\"@@@", + "@@@STEP_LOG_LINE@json.output@ \"skia\": \"abc123\"@@@", "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"skia\": {@@@", @@ -77,7 +74,7 @@ "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"9046e2e693bb92a76e972b694580e5d17ad10748\", @@@", "@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master@{#164710}\"@@@", "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"root\": \"skia\", @@@", "@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"skia\": {@@@", diff --git a/infra/bots/recipes/recreate_skps.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json b/infra/bots/recipes/recreate_skps.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json index 74a0c403db..8676efb578 100644 --- a/infra/bots/recipes/recreate_skps.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json +++ b/infra/bots/recipes/recreate_skps.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json @@ -33,7 +33,7 @@ "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", - "cache_dir = '[START_DIR]/cache/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}, {'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", + "cache_dir = '[START_DIR]/cache/git'\nsolutions = [{'custom_vars': {'checkout_chromium': True}, 'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", "--revision_mapping_file", @@ -45,9 +45,7 @@ "--output_json", "/path/to/tmp/json", "--revision", - "skia@abc123", - "--revision", - "src@origin/master" + "skia@abc123" ], "cwd": "[START_DIR]/cache/work", "env_prefixes": { @@ -62,8 +60,7 @@ "@@@STEP_LOG_LINE@json.output@{@@@", "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@", "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia\": \"abc123\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"src\": \"origin/master\"@@@", + "@@@STEP_LOG_LINE@json.output@ \"skia\": \"abc123\"@@@", "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"skia\": {@@@", @@ -77,7 +74,7 @@ "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"9046e2e693bb92a76e972b694580e5d17ad10748\", @@@", "@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master@{#164710}\"@@@", "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"root\": \"skia\", @@@", "@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"skia\": {@@@", diff --git a/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json b/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json index c550ea935d..dd6788d66c 100644 --- a/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json +++ b/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json @@ -33,7 +33,7 @@ "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", - "cache_dir = '[START_DIR]/cache/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}, {'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", + "cache_dir = '[START_DIR]/cache/git'\nsolutions = [{'custom_vars': {'checkout_chromium': True}, 'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", "--revision_mapping_file", @@ -45,9 +45,7 @@ "--output_json", "/path/to/tmp/json", "--revision", - "skia@abc123", - "--revision", - "src@origin/master" + "skia@abc123" ], "cwd": "[START_DIR]/cache/work", "env_prefixes": { @@ -62,8 +60,7 @@ "@@@STEP_LOG_LINE@json.output@{@@@", "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@", "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia\": \"abc123\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"src\": \"origin/master\"@@@", + "@@@STEP_LOG_LINE@json.output@ \"skia\": \"abc123\"@@@", "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"skia\": {@@@", @@ -77,7 +74,7 @@ "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"9046e2e693bb92a76e972b694580e5d17ad10748\", @@@", "@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master@{#164710}\"@@@", "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"root\": \"skia\", @@@", "@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"skia\": {@@@", diff --git a/infra/bots/recipes/recreate_skps.expected/failed_upload.json b/infra/bots/recipes/recreate_skps.expected/failed_upload.json index 1fac2677bd..7b0888c341 100644 --- a/infra/bots/recipes/recreate_skps.expected/failed_upload.json +++ b/infra/bots/recipes/recreate_skps.expected/failed_upload.json @@ -33,7 +33,7 @@ "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", - "cache_dir = '[START_DIR]/cache/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}, {'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", + "cache_dir = '[START_DIR]/cache/git'\nsolutions = [{'custom_vars': {'checkout_chromium': True}, 'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", "--revision_mapping_file", @@ -45,9 +45,7 @@ "--output_json", "/path/to/tmp/json", "--revision", - "skia@abc123", - "--revision", - "src@origin/master" + "skia@abc123" ], "cwd": "[START_DIR]/cache/work", "env_prefixes": { @@ -62,8 +60,7 @@ "@@@STEP_LOG_LINE@json.output@{@@@", "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@", "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia\": \"abc123\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"src\": \"origin/master\"@@@", + "@@@STEP_LOG_LINE@json.output@ \"skia\": \"abc123\"@@@", "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"skia\": {@@@", @@ -77,7 +74,7 @@ "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"9046e2e693bb92a76e972b694580e5d17ad10748\", @@@", "@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master@{#164710}\"@@@", "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"root\": \"skia\", @@@", "@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"skia\": {@@@", |