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

remove MSRTC bots and GN support

Browse Source 
We've failed to get these bots to report where issues happen
any more finely than the name of the executable, which makes
them a real pain to fix when they go red.

We don't expect we'll be able to run cleanly in this mode for
long without bots enforcing it, so remove support from GN too.

Change-Id: Ie86f0cbf2f5f859ac2ddb869da7e5b8d31b33fa0
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/237195
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
This commit is contained in:
Mike Klein 2019-08-26 12:12:37 -05:00 committed by Skia Commit-Bot
parent 238fc249a4
commit a2931beb4b
11 changed files with 0 additions and 797 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gn/BUILD.gn
View File

@ -460,15 +460,6 @@ config("NDEBUG") {
defines = [ "NDEBUG" ]
}
config("msvc_rtc") {
defines = [ "_ALLOW_RTCc_IN_STL" ]
cflags = [
"/RTCcsu",
"/guard:cf",
]
ldflags = [ "/guard:cf" ]
}
config("executable") {
if (is_android) {
ldflags = [

3
gn/BUILDCONFIG.gn
View File

@ -176,9 +176,6 @@ default_configs += [
"//gn:warnings_except_public_headers",
"//gn:extra_flags",
]
if (sanitize == "MSVC") {
default_configs += [ "//gn:msvc_rtc" ]
}
set_defaults("executable") {
configs = [ "//gn:executable" ] + default_configs

1
infra/bots/cfg.json
View File

@ -11,7 +11,6 @@
"AbandonGpuContext",
"Coverage",
"MSAN",
"MSRTC",
"OpenCL",
"SKQP",
"TSAN",

5
infra/bots/jobs.json
View File

@ -130,8 +130,6 @@
"Build-Win-MSVC-x86-Debug",
"Build-Win-MSVC-x86-Release",
"Build-Win-MSVC-x86_64-Debug",
"Build-Win-MSVC-x86_64-Debug-MSRTC",
"Build-Win-MSVC-x86_64-Debug-MSRTC_Vulkan",
"Build-Win-MSVC-x86_64-Debug-Vulkan",
"Build-Win-MSVC-x86_64-Debug-Wuffs",
"Build-Win-MSVC-x86_64-Release",
@ -556,8 +554,6 @@
"Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE",
"Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-Vulkan",
"Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All",
"Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-MSRTC",
"Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-MSRTC_Vulkan",
"Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan",
"Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All",
"Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan",
@ -576,7 +572,6 @@
"Test-Win2016-MSVC-GCE-CPU-AVX2-x86-Debug-All",
"Test-Win2016-MSVC-GCE-CPU-AVX2-x86-Release-All",
"Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Debug-All",
"Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Debug-All-MSRTC",
"Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All",
"Test-Win7-Clang-Golo-CPU-AVX-x86-Debug-All",
"Test-Win7-Clang-Golo-CPU-AVX-x86-Release-All",

3
infra/bots/recipe_modules/build/default.py
View File

@ -282,9 +282,6 @@ def compile_fn(api, checkout_root, out_dir):
if 'SafeStack' in extra_tokens:
assert sanitize == ''
sanitize = 'safe-stack'
if 'MSRTC' in extra_tokens:
assert sanitize == ''
sanitize = 'MSVC'
if 'Wuffs' in extra_tokens:
args['skia_use_wuffs'] = 'true'

84
infra/bots/recipe_modules/build/examples/full.expected/Build-Win-MSVC-x86_64-Debug-MSRTC.json
View File

@ -1,84 +0,0 @@
[
{
"cmd": [
"python",
"-u",
"[START_DIR]\\cache\\work\\skia\\bin\\fetch-gn"
],
"cwd": "[START_DIR]\\cache\\work\\skia",
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>;RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "fetch-gn"
},
{
"cmd": [
"[START_DIR]\\cache\\work\\skia\\bin\\gn",
"gen",
"[START_DIR]\\cache\\work\\skia\\out\\Build-Win-MSVC-x86_64-Debug-MSRTC\\Debug_x64",
"--args=sanitize=\"MSVC\" target_cpu=\"x86_64\" werror=true win_sdk=\"[START_DIR]\\win_toolchain/win_sdk\" win_vc=\"[START_DIR]\\win_toolchain/VC\""
],
"cwd": "[START_DIR]\\cache\\work\\skia",
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>;RECIPE_REPO[depot_tools]"
},
"name": "gn gen"
},
{
"cmd": [
"ninja",
"-C",
"[START_DIR]\\cache\\work\\skia\\out\\Build-Win-MSVC-x86_64-Debug-MSRTC\\Debug_x64"
],
"cwd": "[START_DIR]\\cache\\work\\skia",
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>;RECIPE_REPO[depot_tools]"
},
"name": "ninja"
},
{
"cmd": [
"python",
"-u",
"import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'hello-opencl', 'hello-opencl.exe', 'nanobench', 'nanobench.exe', 'skpbench', 'skpbench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'skottie_tool', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n",
"[START_DIR]\\cache\\work\\skia\\out\\Build-Win-MSVC-x86_64-Debug-MSRTC\\Debug_x64",
"[START_DIR]\\[SWARM_OUT_DIR]\\out\\Debug_x64"
],
"infra_step": true,
"name": "copy build products",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@import errno@@@",
"@@@STEP_LOG_LINE@python.inline@import glob@@@",
"@@@STEP_LOG_LINE@python.inline@import os@@@",
"@@@STEP_LOG_LINE@python.inline@import shutil@@@",
"@@@STEP_LOG_LINE@python.inline@import sys@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@src = sys.argv[1]@@@",
"@@@STEP_LOG_LINE@python.inline@dst = sys.argv[2]@@@",
"@@@STEP_LOG_LINE@python.inline@build_products_whitelist = ['dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'hello-opencl', 'hello-opencl.exe', 'nanobench', 'nanobench.exe', 'skpbench', 'skpbench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'skottie_tool', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@try:@@@",
"@@@STEP_LOG_LINE@python.inline@ os.makedirs(dst)@@@",
"@@@STEP_LOG_LINE@python.inline@except OSError as e:@@@",
"@@@STEP_LOG_LINE@python.inline@ if e.errno != errno.EEXIST:@@@",
"@@@STEP_LOG_LINE@python.inline@ raise@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@for pattern in build_products_whitelist:@@@",
"@@@STEP_LOG_LINE@python.inline@ path = os.path.join(src, pattern)@@@",
"@@@STEP_LOG_LINE@python.inline@ for f in glob.glob(path):@@@",
"@@@STEP_LOG_LINE@python.inline@ dst_path = os.path.join(dst, os.path.relpath(f, src))@@@",
"@@@STEP_LOG_LINE@python.inline@ if not os.path.isdir(os.path.dirname(dst_path)):@@@",
"@@@STEP_LOG_LINE@python.inline@ os.makedirs(os.path.dirname(dst_path))@@@",
"@@@STEP_LOG_LINE@python.inline@ print 'Copying build product %s to %s' % (f, dst_path)@@@",
"@@@STEP_LOG_LINE@python.inline@ shutil.move(f, dst_path)@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
},
{
"name": "$result"
}
]

1
infra/bots/recipe_modules/build/examples/full.py
View File

@ -68,7 +68,6 @@ TEST_BUILDERS = [
'Build-Win-Clang-x86-Debug-Exceptions',
'Build-Win-Clang-x86_64-Debug-OpenCL',
'Build-Win-Clang-x86_64-Release-Vulkan',
'Build-Win-MSVC-x86_64-Debug-MSRTC',
'Test-Debian9-Clang-GCE-CPU-AVX2-universal-devrel-All-Android_SKQP',
'Housekeeper-PerCommit-CheckGeneratedFiles',
]

270
infra/bots/recipes/test.expected/Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Debug-All-MSRTC.json
View File

@ -1,270 +0,0 @@
[
{
"cmd": [
"python",
"-u",
"RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
"--json-output",
"/path/to/tmp/json",
"ensure-directory",
"--mode",
"0777",
"[START_DIR]\\tmp"
],
"infra_step": true,
"name": "makedirs tmp_dir"
},
{
"cmd": [
"python",
"-u",
"RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
"[START_DIR]\\skia\\infra\\bots\\assets\\skp\\VERSION",
"/path/to/tmp/"
],
"infra_step": true,
"name": "Get skp VERSION"
},
{
"cmd": [
"python",
"-u",
"RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
"42",
"[START_DIR]\\tmp\\SKP_VERSION"
],
"infra_step": true,
"name": "write SKP_VERSION",
"~followup_annotations": [
"@@@STEP_LOG_LINE@SKP_VERSION@42@@@",
"@@@STEP_LOG_END@SKP_VERSION@@@"
]
},
{
"cmd": [
"python",
"-u",
"RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
"[START_DIR]\\skia\\infra\\bots\\assets\\skimage\\VERSION",
"/path/to/tmp/"
],
"infra_step": true,
"name": "Get skimage VERSION"
},
{
"cmd": [
"python",
"-u",
"RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
"42",
"[START_DIR]\\tmp\\SK_IMAGE_VERSION"
],
"infra_step": true,
"name": "write SK_IMAGE_VERSION",
"~followup_annotations": [
"@@@STEP_LOG_LINE@SK_IMAGE_VERSION@42@@@",
"@@@STEP_LOG_END@SK_IMAGE_VERSION@@@"
]
},
{
"cmd": [
"python",
"-u",
"RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
"[START_DIR]\\skia\\infra\\bots\\assets\\svg\\VERSION",
"/path/to/tmp/"
],
"infra_step": true,
"name": "Get svg VERSION"
},
{
"cmd": [
"python",
"-u",
"RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
"42",
"[START_DIR]\\tmp\\SVG_VERSION"
],
"infra_step": true,
"name": "write SVG_VERSION",
"~followup_annotations": [
"@@@STEP_LOG_LINE@SVG_VERSION@42@@@",
"@@@STEP_LOG_END@SVG_VERSION@@@"
]
},
{
"cmd": [
"python",
"-u",
"import os\nprint os.environ.get('SWARMING_BOT_ID', '')\n"
],
"name": "get swarming bot id",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@import os@@@",
"@@@STEP_LOG_LINE@python.inline@print os.environ.get('SWARMING_BOT_ID', '')@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
},
{
"cmd": [
"python",
"-u",
"import os\nprint os.environ.get('SWARMING_TASK_ID', '')\n"
],
"name": "get swarming task id",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@import os@@@",
"@@@STEP_LOG_LINE@python.inline@print os.environ.get('SWARMING_TASK_ID', '')@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
},
{
"cmd": [
"powershell",
"-ExecutionPolicy",
"Unrestricted",
"-File",
"RECIPE_MODULE[skia::flavor]\\resources\\win_run_and_check_log.ps1",
"[START_DIR]\\build\\dm",
"--resourcePath",
"[START_DIR]\\skia\\resources",
"--skps",
"[START_DIR]\\skp",
"--images",
"[START_DIR]\\skimage\\dm",
"--colorImages",
"[START_DIR]\\skimage\\colorspace",
"--nameByHash",
"--properties",
"gitHash",
"abc123",
"builder",
"Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Debug-All-MSRTC",
"buildbucket_build_id",
"123454321",
"task_id",
"task_12345",
"swarming_bot_id",
"skia-bot-123",
"swarming_task_id",
"123456",
"--svgs",
"[START_DIR]\\svg",
"--key",
"arch",
"x86_64",
"compiler",
"MSVC",
"configuration",
"Debug",
"cpu_or_gpu",
"CPU",
"cpu_or_gpu_value",
"AVX2",
"extra_config",
"MSRTC",
"model",
"GCE",
"os",
"Win2016",
"style",
"default",
"--dont_write",
"pdf",
"--randomProcessorTest",
"--nogpu",
"--config",
"8888",
"--src",
"tests",
"gm",
"image",
"colorImage",
"--blacklist",
"_",
"image",
"gen_platf",
"pal8os2v2.bmp",
"_",
"image",
"gen_platf",
"pal8os2v2-16.bmp",
"_",
"image",
"gen_platf",
"rgba32abf.bmp",
"_",
"image",
"gen_platf",
"rgb24prof.bmp",
"_",
"image",
"gen_platf",
"rgb24lprof.bmp",
"_",
"image",
"gen_platf",
"8bpp-pixeldata-cropped.bmp",
"_",
"image",
"gen_platf",
"4bpp-pixeldata-cropped.bmp",
"_",
"image",
"gen_platf",
"32bpp-pixeldata-cropped.bmp",
"_",
"image",
"gen_platf",
"24bpp-pixeldata-cropped.bmp",
"_",
"gm",
"_",
"composeshader_bitmap",
"_",
"image",
"gen_platf",
"testimgari.jpg",
"_",
"image",
"gen_platf",
"rle8-height-negative.bmp",
"_",
"image",
"gen_platf",
"rle4-height-negative.bmp",
"_",
"image",
"gen_platf",
"error",
"--nonativeFonts",
"--verbose"
],
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>;RECIPE_REPO[depot_tools]"
},
"name": "dm"
},
{
"name": "$result"
}
]

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

@ -27,7 +27,6 @@ def upload_dm_results(buildername):
'ASAN',
'Coverage',
'MSAN',
'MSRTC',
'TSAN',
'UBSAN',
'Valgrind',
@ -1067,7 +1066,6 @@ TEST_BUILDERS = [
'Test-Win10-MSVC-LenovoYogaC630-GPU-Adreno630-arm64-Debug-All-ANGLE',
'Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA',
'Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA',
'Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Debug-All-MSRTC',
'Test-iOS-Clang-iPadPro-GPU-PowerVRGT7800-arm64-Release-All',
'Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android_Vulkan',
'Test-Mac10.13-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All-CommandBuffer',

415
infra/bots/tasks.json
View File

@ -661,16 +661,6 @@
"Build-Win-MSVC-x86_64-Debug"
]
},
"Build-Win-MSVC-x86_64-Debug-MSRTC": {
"tasks": [
"Build-Win-MSVC-x86_64-Debug-MSRTC"
]
},
"Build-Win-MSVC-x86_64-Debug-MSRTC_Vulkan": {
"tasks": [
"Build-Win-MSVC-x86_64-Debug-MSRTC_Vulkan"
]
},
"Build-Win-MSVC-x86_64-Debug-Vulkan": {
"tasks": [
"Build-Win-MSVC-x86_64-Debug-Vulkan"
@ -2809,16 +2799,6 @@
"Upload-Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All"
]
},
"Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-MSRTC": {
"tasks": [
"Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-MSRTC"
]
},
"Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-MSRTC_Vulkan": {
"tasks": [
"Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-MSRTC_Vulkan"
]
},
"Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan": {
"tasks": [
"Upload-Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan"
@ -2909,11 +2889,6 @@
"Upload-Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Debug-All"
]
},
"Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Debug-All-MSRTC": {
"tasks": [
"Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Debug-All-MSRTC"
]
},
"Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All": {
"tasks": [
"Upload-Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All"
@ -12453,148 +12428,6 @@
],
"service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
},
"Build-Win-MSVC-x86_64-Debug-MSRTC": {
"caches": [
{
"name": "vpython",
"path": "cache/vpython"
}
],
"cipd_packages": [
{
"name": "infra/tools/luci/kitchen/${platform}",
"path": ".",
"version": "git_revision:d8f38ca9494b5af249942631f9cee45927f6b4bc"
},
{
"name": "infra/tools/luci-auth/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e"
},
{
"name": "infra/tools/luci/vpython/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b"
},
{
"name": "infra/python/cpython/${platform}",
"path": "cipd_bin_packages",
"version": "version:2.7.15.chromium14"
}
],
"command": [
"cipd_bin_packages/vpython${EXECUTABLE_SUFFIX}",
"skia/infra/bots/run_recipe.py",
"${ISOLATED_OUTDIR}",
"compile",
"{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-MSVC-x86_64-Debug-MSRTC\",\"swarm_out_dir\":\"build\"}",
"skia"
],
"dependencies": [
"Housekeeper-PerCommit-BundleRecipes",
"Housekeeper-PerCommit-IsolateWinToolchain"
],
"dimensions": [
"cpu:x86-64-Haswell_GCE",
"gpu:none",
"image:windows-server-2016-dc-v20190108",
"machine_type:n1-highcpu-64",
"os:Windows-Server-14393",
"pool:Skia"
],
"env_prefixes": {
"PATH": [
"cipd_bin_packages",
"cipd_bin_packages/bin"
],
"VPYTHON_VIRTUALENV_ROOT": [
"cache/vpython"
]
},
"execution_timeout_ns": 3600000000000,
"extra_tags": {
"log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
},
"idempotent": true,
"io_timeout_ns": 3600000000000,
"isolate": "compile.isolate",
"max_attempts": 2,
"outputs": [
"build"
],
"service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
},
"Build-Win-MSVC-x86_64-Debug-MSRTC_Vulkan": {
"caches": [
{
"name": "vpython",
"path": "cache/vpython"
}
],
"cipd_packages": [
{
"name": "infra/tools/luci/kitchen/${platform}",
"path": ".",
"version": "git_revision:d8f38ca9494b5af249942631f9cee45927f6b4bc"
},
{
"name": "infra/tools/luci-auth/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e"
},
{
"name": "infra/tools/luci/vpython/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b"
},
{
"name": "infra/python/cpython/${platform}",
"path": "cipd_bin_packages",
"version": "version:2.7.15.chromium14"
}
],
"command": [
"cipd_bin_packages/vpython${EXECUTABLE_SUFFIX}",
"skia/infra/bots/run_recipe.py",
"${ISOLATED_OUTDIR}",
"compile",
"{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-MSVC-x86_64-Debug-MSRTC_Vulkan\",\"swarm_out_dir\":\"build\"}",
"skia"
],
"dependencies": [
"Housekeeper-PerCommit-BundleRecipes",
"Housekeeper-PerCommit-IsolateWinToolchain"
],
"dimensions": [
"cpu:x86-64-Haswell_GCE",
"gpu:none",
"image:windows-server-2016-dc-v20190108",
"machine_type:n1-highcpu-64",
"os:Windows-Server-14393",
"pool:Skia"
],
"env_prefixes": {
"PATH": [
"cipd_bin_packages",
"cipd_bin_packages/bin"
],
"VPYTHON_VIRTUALENV_ROOT": [
"cache/vpython"
]
},
"execution_timeout_ns": 3600000000000,
"extra_tags": {
"log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
},
"idempotent": true,
"io_timeout_ns": 3600000000000,
"isolate": "compile.isolate",
"max_attempts": 2,
"outputs": [
"build"
],
"service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
},
"Build-Win-MSVC-x86_64-Debug-Vulkan": {
"caches": [
{
@ -44471,170 +44304,6 @@
"test"
]
},
"Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-MSRTC": {
"caches": [
{
"name": "vpython",
"path": "cache/vpython"
}
],
"cipd_packages": [
{
"name": "infra/tools/luci/kitchen/${platform}",
"path": ".",
"version": "git_revision:d8f38ca9494b5af249942631f9cee45927f6b4bc"
},
{
"name": "infra/tools/luci-auth/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e"
},
{
"name": "infra/tools/luci/vpython/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b"
},
{
"name": "infra/python/cpython/${platform}",
"path": "cipd_bin_packages",
"version": "version:2.7.15.chromium14"
},
{
"name": "skia/bots/skimage",
"path": "skimage",
"version": "version:39"
},
{
"name": "skia/bots/skp",
"path": "skp",
"version": "version:201"
},
{
"name": "skia/bots/svg",
"path": "svg",
"version": "version:9"
}
],
"command": [
"cipd_bin_packages/vpython${EXECUTABLE_SUFFIX}",
"skia/infra/bots/run_recipe.py",
"${ISOLATED_OUTDIR}",
"test",
"{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-MSRTC\",\"gold_hashes_url\":\"https://storage.googleapis.com/skia-infra-gm/hash_files/gold-prod-hashes.txt\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
"skia"
],
"dependencies": [
"Housekeeper-PerCommit-BundleRecipes",
"Build-Win-MSVC-x86_64-Debug-MSRTC"
],
"dimensions": [
"gpu:10de:1cb3-25.21.14.1678",
"os:Windows-10-16299",
"pool:Skia"
],
"env_prefixes": {
"PATH": [
"cipd_bin_packages",
"cipd_bin_packages/bin"
],
"VPYTHON_VIRTUALENV_ROOT": [
"cache/vpython"
]
},
"execution_timeout_ns": 14400000000000,
"expiration_ns": 72000000000000,
"extra_tags": {
"log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
},
"io_timeout_ns": 14400000000000,
"isolate": "test_skia_bundled.isolate",
"max_attempts": 2,
"outputs": [
"test"
]
},
"Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-MSRTC_Vulkan": {
"caches": [
{
"name": "vpython",
"path": "cache/vpython"
}
],
"cipd_packages": [
{
"name": "infra/tools/luci/kitchen/${platform}",
"path": ".",
"version": "git_revision:d8f38ca9494b5af249942631f9cee45927f6b4bc"
},
{
"name": "infra/tools/luci-auth/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e"
},
{
"name": "infra/tools/luci/vpython/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b"
},
{
"name": "infra/python/cpython/${platform}",
"path": "cipd_bin_packages",
"version": "version:2.7.15.chromium14"
},
{
"name": "skia/bots/skimage",
"path": "skimage",
"version": "version:39"
},
{
"name": "skia/bots/skp",
"path": "skp",
"version": "version:201"
},
{
"name": "skia/bots/svg",
"path": "svg",
"version": "version:9"
}
],
"command": [
"cipd_bin_packages/vpython${EXECUTABLE_SUFFIX}",
"skia/infra/bots/run_recipe.py",
"${ISOLATED_OUTDIR}",
"test",
"{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-MSRTC_Vulkan\",\"gold_hashes_url\":\"https://storage.googleapis.com/skia-infra-gm/hash_files/gold-prod-hashes.txt\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
"skia"
],
"dependencies": [
"Housekeeper-PerCommit-BundleRecipes",
"Build-Win-MSVC-x86_64-Debug-MSRTC_Vulkan"
],
"dimensions": [
"gpu:10de:1cb3-25.21.14.1678",
"os:Windows-10-16299",
"pool:Skia"
],
"env_prefixes": {
"PATH": [
"cipd_bin_packages",
"cipd_bin_packages/bin"
],
"VPYTHON_VIRTUALENV_ROOT": [
"cache/vpython"
]
},
"execution_timeout_ns": 14400000000000,
"expiration_ns": 72000000000000,
"extra_tags": {
"log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
},
"io_timeout_ns": 14400000000000,
"isolate": "test_skia_bundled.isolate",
"max_attempts": 2,
"outputs": [
"test"
]
},
"Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan": {
"caches": [
{
@ -46127,90 +45796,6 @@
"test"
]
},
"Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Debug-All-MSRTC": {
"caches": [
{
"name": "vpython",
"path": "cache/vpython"
}
],
"cipd_packages": [
{
"name": "infra/tools/luci/kitchen/${platform}",
"path": ".",
"version": "git_revision:d8f38ca9494b5af249942631f9cee45927f6b4bc"
},
{
"name": "infra/tools/luci-auth/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e"
},
{
"name": "infra/tools/luci/vpython/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b"
},
{
"name": "infra/python/cpython/${platform}",
"path": "cipd_bin_packages",
"version": "version:2.7.15.chromium14"
},
{
"name": "skia/bots/skimage",
"path": "skimage",
"version": "version:39"
},
{
"name": "skia/bots/skp",
"path": "skp",
"version": "version:201"
},
{
"name": "skia/bots/svg",
"path": "svg",
"version": "version:9"
}
],
"command": [
"cipd_bin_packages/vpython${EXECUTABLE_SUFFIX}",
"skia/infra/bots/run_recipe.py",
"${ISOLATED_OUTDIR}",
"test",
"{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Debug-All-MSRTC\",\"gold_hashes_url\":\"https://storage.googleapis.com/skia-infra-gm/hash_files/gold-prod-hashes.txt\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
"skia"
],
"dependencies": [
"Housekeeper-PerCommit-BundleRecipes",
"Build-Win-MSVC-x86_64-Debug-MSRTC"
],
"dimensions": [
"cpu:x86-64-Haswell_GCE",
"image:windows-server-2016-dc-v20190108",
"machine_type:n1-standard-16",
"os:Windows-Server-14393",
"pool:Skia"
],
"env_prefixes": {
"PATH": [
"cipd_bin_packages",
"cipd_bin_packages/bin"
],
"VPYTHON_VIRTUALENV_ROOT": [
"cache/vpython"
]
},
"execution_timeout_ns": 14400000000000,
"expiration_ns": 72000000000000,
"extra_tags": {
"log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
},
"io_timeout_ns": 14400000000000,
"isolate": "test_skia_bundled.isolate",
"max_attempts": 2,
"outputs": [
"test"
]
},
"Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All": {
"caches": [
{

4
third_party/third_party.gni vendored
View File

@ -71,10 +71,6 @@ set_defaults("third_party") {
configs -= [ "//gn:warnings" ]
}
# Don't want to to deal with this (especially /RTCc)
if (sanitize == "MSVC") {
configs -= [ "//gn:msvc_rtc" ]
}
if (is_debug) {
configs += [ "//gn:optimize" ]
}