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

Remove recipes code for RecreateSKPs bot, as well as chromium DEPS entry

Browse Source 
Change-Id: I1ca07f97757f70debc0589648a57ba10b1729636
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/537081
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
This commit is contained in:
Brian Osman 2022-05-04 11:40:18 -04:00 committed by SkCQ
parent b894c69abb
commit 2e1cc9a946
6 changed files with 53 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
DEPS
View File

@ -1,8 +1,6 @@
use_relative_paths = True
vars = {
"checkout_chromium": False,
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling different
# dependencies without interference from each other.
@ -53,11 +51,6 @@ deps = {
"third_party/externals/wuffs" : "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git@600cd96cf47788ee3a74b40a6028b035c9fd6a61",
"third_party/externals/zlib" : "https://chromium.googlesource.com/chromium/src/third_party/zlib@c876c8f87101c5a75f6014b0f832499afeb65b73",
"../src": {
"url": "https://chromium.googlesource.com/chromium/src.git@2635a346f46f35623bfb76b72c9cfb00cb1fec52",
"condition": "checkout_chromium",
},
'bin': {
'packages': [
{
@ -68,9 +61,3 @@ deps = {
'dep_type': 'cipd',
},
}
recursedeps = [
"../src",
]
gclient_gn_args_from = 'src'

6
infra/bots/README.recipes.md
View File

@ -89,19 +89,15 @@ PYTHON_VERSION_COMPATIBILITY: PY3
Fail if git is not obtained from CIPD.
&mdash; **def [bot\_update](/infra/bots/recipe_modules/checkout/api.py#48)(self, checkout_root, gclient_cache=None, checkout_chromium=False, checkout_flutter=False, extra_gclient_env=None, flutter_android=False):**
&mdash; **def [bot\_update](/infra/bots/recipe_modules/checkout/api.py#48)(self, checkout_root, gclient_cache=None, checkout_flutter=False, flutter_android=False):**
Run the steps to obtain a checkout using bot_update.
Args:
checkout_root: Root directory where the code will be synced.
gclient_cache: Optional, directory of the gclient cache.
checkout_chromium: If True, will check out chromium/src.git in addition
to the primary repo.
checkout_flutter: If True, will checkout flutter in addition to the
primary repo.
extra_gclient_env: Map of extra environment variable names to their values
to supply while running gclient.
flutter_android: Indicates that we're checking out flutter for Android.
&emsp; **@property**<br>&mdash; **def [default\_checkout\_root](/infra/bots/recipe_modules/checkout/api.py#15)(self):**

17
infra/bots/recipe_modules/checkout/api.py
View File

@ -46,27 +46,20 @@ if 'cipd_bin_packages' not in git:
return self.m.properties['revision']
def bot_update(self, checkout_root, gclient_cache=None,
checkout_chromium=False, checkout_flutter=False,
extra_gclient_env=None,
checkout_flutter=False,
flutter_android=False):
"""Run the steps to obtain a checkout using bot_update.
Args:
checkout_root: Root directory where the code will be synced.
gclient_cache: Optional, directory of the gclient cache.
checkout_chromium: If True, will check out chromium/src.git in addition
to the primary repo.
checkout_flutter: If True, will checkout flutter in addition to the
primary repo.
extra_gclient_env: Map of extra environment variable names to their values
to supply while running gclient.
flutter_android: Indicates that we're checking out flutter for Android.
"""
self.assert_git_is_from_cipd()
if not gclient_cache:
gclient_cache = self.m.vars.cache_dir.join('git')
if not extra_gclient_env:
extra_gclient_env = {}
cfg_kwargs = {}
@ -126,10 +119,6 @@ if 'cipd_bin_packages' not in git:
m[skia_dep_path] = 'got_revision'
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')
@ -160,10 +149,8 @@ if 'cipd_bin_packages' not in git:
download_topics=True,
)
if checkout_chromium or checkout_flutter:
if checkout_flutter:
gclient_env = {'DEPOT_TOOLS_UPDATE': '0'}
if extra_gclient_env:
gclient_env.update(extra_gclient_env)
with self.m.context(cwd=checkout_root, env=gclient_env):
self.m.gclient.runhooks()
return update_step.presentation.properties['got_revision']

70
infra/bots/recipe_modules/checkout/examples/full.expected/Housekeeper-Weekly-RecreateSKPs.json → infra/bots/recipe_modules/checkout/examples/full.expected/Build-Debian9-Clang-arm-Release-Flutter_Android_Docker.json
View File

@ -25,6 +25,19 @@
"@@@STEP_LOG_END@python.inline@@@"
]
},
{
"cmd": [
"vpython",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"rmtree",
"[START_DIR]/cache/work/flutter"
],
"infra_step": true,
"name": "rmtree flutter"
},
{
"cmd": [
"vpython",
@ -35,7 +48,7 @@
"ensure-directory",
"--mode",
"0777",
"[START_DIR]/cache/work"
"[START_DIR]/cache/work/flutter"
],
"infra_step": true,
"name": "makedirs checkout_path"
@ -48,10 +61,10 @@
"--json-output",
"/path/to/tmp/json",
"remove",
"[START_DIR]/cache/work/.gclient_entries"
"[START_DIR]/cache/work/flutter/.gclient_entries"
],
"infra_step": true,
"name": "remove [START_DIR]/cache/work/.gclient_entries"
"name": "remove [START_DIR]/cache/work/flutter/.gclient_entries"
},
{
"cmd": [
@ -59,11 +72,11 @@
"-u",
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
"--spec-path",
"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'}]",
"cache_dir = '[START_DIR]/cache/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src/flutter', 'url': 'https://github.com/flutter/engine.git'}]\ntarget_os = ['android']",
"--patch_root",
"skia",
"src/third_party/skia",
"--revision_mapping_file",
"{\"got_revision\": \"skia\"}",
"{\"got_flutter_revision\": \"src/flutter\", \"got_revision\": \"src/third_party/skia\"}",
"--git-cache-dir",
"[START_DIR]/cache/git",
"--cleanup-dir",
@ -71,10 +84,12 @@
"--output_json",
"/path/to/tmp/json",
"--revision",
"skia@abc123",
"src/flutter@origin/master",
"--revision",
"src/third_party/skia@abc123",
"--download_topics"
],
"cwd": "[START_DIR]/cache/work",
"cwd": "[START_DIR]/cache/work/flutter",
"env": {
"DEPOT_TOOLS_COLLECT_METRICS": "0",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
@ -95,26 +110,39 @@
"@@@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/flutter\": \"origin/master\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"src/third_party/skia\": \"abc123\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"skia\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/skia.git\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"src/flutter\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/flutter.git\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"a1681567f61ff6b59df53546991904bbf6eda393\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"src/third_party/skia\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/third_party/skia.git\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"abc123\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"skia\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src/third_party/skia\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"got_flutter_revision\": \"a1681567f61ff6b59df53546991904bbf6eda393\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"got_flutter_revision_cp\": \"refs/heads/master@{#84512}\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"abc123\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/main@{#164710}\"@@@",
"@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/main@{#143121}\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"root\": \"skia\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"root\": \"src/flutter\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"skia\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"src/flutter\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/skia.git\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/src/flutter.git\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"a1681567f61ff6b59df53546991904bbf6eda393\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"src/third_party/skia\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/src/third_party/skia.git\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"abc123\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@ -124,8 +152,10 @@
"@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@",
"@@@SET_BUILD_PROPERTY@got_flutter_revision@\"a1681567f61ff6b59df53546991904bbf6eda393\"@@@",
"@@@SET_BUILD_PROPERTY@got_flutter_revision_cp@\"refs/heads/master@{#84512}\"@@@",
"@@@SET_BUILD_PROPERTY@got_revision@\"abc123\"@@@",
"@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/main@{#164710}\"@@@"
"@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/main@{#143121}\"@@@"
]
},
{
@ -135,11 +165,9 @@
"RECIPE_REPO[depot_tools]/gclient.py",
"runhooks"
],
"cwd": "[START_DIR]/cache/work",
"cwd": "[START_DIR]/cache/work/flutter",
"env": {
"CPPFLAGS": "-DSK_ALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS=1",
"DEPOT_TOOLS_UPDATE": "0",
"GYP_CHROMIUM_NO_ACTION": "0"
"DEPOT_TOOLS_UPDATE": "0"
},
"env_suffixes": {
"PATH": [

10
infra/bots/recipe_modules/checkout/examples/full.py
View File

@ -23,14 +23,8 @@ def RunSteps(api):
bot_update = False
checkout_root = api.checkout.default_checkout_root
checkout_chromium = False
checkout_flutter = False
extra_gclient_env = {}
flutter_android = False
if 'RecreateSKPs' in api.vars.builder_name:
checkout_chromium = True
extra_gclient_env['CPPFLAGS'] = (
'-DSK_ALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS=1')
if 'Flutter' in api.vars.builder_name:
checkout_root = checkout_root.join('flutter')
checkout_flutter = True
@ -40,9 +34,7 @@ def RunSteps(api):
if bot_update:
api.checkout.bot_update(
checkout_root=checkout_root,
checkout_chromium=checkout_chromium,
checkout_flutter=checkout_flutter,
extra_gclient_env=extra_gclient_env,
flutter_android=flutter_android)
else:
api.checkout.git(checkout_root=api.path['start_dir'])
@ -50,7 +42,7 @@ def RunSteps(api):
TEST_BUILDERS = [
'Housekeeper-Weekly-RecreateSKPs',
'Build-Debian9-Clang-arm-Release-Flutter_Android_Docker',
]

2
infra/bots/recipes/sync_and_compile.py
View File

@ -29,7 +29,6 @@ def RunSteps(api):
# Check out code.
bot_update = True
checkout_root = api.checkout.default_checkout_root
checkout_chromium = False
checkout_flutter = False
flutter_android = False
@ -45,7 +44,6 @@ def RunSteps(api):
if bot_update:
api.checkout.bot_update(
checkout_root=checkout_root,
checkout_chromium=checkout_chromium,
checkout_flutter=checkout_flutter,
flutter_android=flutter_android)
else: