[infra] Use Mac10.15.7 and xcode 12.2 for CommandBuffer builds.
Bug: skia:11082 Change-Id: I5ba2f9ae85ce7e008c2fc656be605c022466720d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/343938 Reviewed-by: Joe Gregorio <jcgregorio@google.com> Reviewed-by: Tyler Denniston <tdenniston@google.com> Commit-Queue: Weston Tracey <westont@google.com>
This commit is contained in:
parent
39ce12e0d4
commit
9b395f55ea
@ -471,6 +471,7 @@ func (b *jobBuilder) deriveCompileTaskName() string {
|
||||
task_os = "Mac"
|
||||
// iPhone11 requires xcode 11.4.1 which requires >10.15.2.
|
||||
if b.parts["model"] == "iPhone11" {
|
||||
// TODO(westont): Make this Mac10.15.7. We only have a single 10.15.5.
|
||||
task_os = "Mac10.15.5"
|
||||
}
|
||||
} else if b.matchOs("Win") {
|
||||
@ -483,6 +484,9 @@ func (b *jobBuilder) deriveCompileTaskName() string {
|
||||
task_os = COMPILE_TASK_NAME_OS_LINUX
|
||||
} else if b.matchOs("Mac") {
|
||||
task_os = "Mac"
|
||||
if b.extraConfig("CommandBuffer") {
|
||||
task_os = "Mac10.15.7"
|
||||
}
|
||||
}
|
||||
jobNameMap := map[string]string{
|
||||
"role": "Build",
|
||||
@ -545,6 +549,7 @@ func (b *taskBuilder) defaultSwarmDimensions() {
|
||||
"Mac10.14": "Mac-10.14.3",
|
||||
"Mac10.15": "Mac-10.15.1",
|
||||
"Mac10.15.5": "Mac-10.15.5", // We have some builders at 10.15.5 to run Xcode 11.4.1
|
||||
"Mac10.15.7": "Mac-10.15.7", // We have some Golo machines at 10.15.7 to run Xcode 12.2
|
||||
"Ubuntu18": "Ubuntu-18.04",
|
||||
"Win": DEFAULT_OS_WIN,
|
||||
"Win10": "Windows-10-18363",
|
||||
|
@ -93,11 +93,11 @@
|
||||
"Build-Mac-Clang-x86_64-Debug",
|
||||
"Build-Mac-Clang-x86_64-Debug-ASAN",
|
||||
"Build-Mac-Clang-x86_64-Debug-ASAN_Metal",
|
||||
"Build-Mac-Clang-x86_64-Debug-CommandBuffer",
|
||||
"Build-Mac10.15.7-Clang-x86_64-Debug-CommandBuffer",
|
||||
"Build-Mac-Clang-x86_64-Debug-Metal",
|
||||
"Build-Mac-Clang-x86_64-Debug-OpenCL",
|
||||
"Build-Mac-Clang-x86_64-Release",
|
||||
"Build-Mac-Clang-x86_64-Release-CommandBuffer",
|
||||
"Build-Mac10.15.7-Clang-x86_64-Release-CommandBuffer",
|
||||
"Build-Mac-Clang-x86_64-Release-Metal",
|
||||
"Build-Mac-Clang-x86_64-Release-TSAN",
|
||||
"Build-Mac-Clang-x86_64-Release-TSAN_Metal",
|
||||
|
@ -94,7 +94,7 @@ def compile_fn(api, checkout_root, out_dir):
|
||||
args = {'werror': 'true'}
|
||||
env = {}
|
||||
|
||||
if os == 'Mac' or os == 'Mac10.15.5':
|
||||
if os == 'Mac' or os == 'Mac10.15.5' or os == 'Mac10.15.7':
|
||||
# XCode build is listed in parentheses after the version at
|
||||
# https://developer.apple.com/news/releases/, or on Wikipedia here:
|
||||
# https://en.wikipedia.org/wiki/Xcode#Version_comparison_table
|
||||
@ -102,6 +102,10 @@ def compile_fn(api, checkout_root, out_dir):
|
||||
XCODE_BUILD_VERSION = '11c29'
|
||||
if os == 'Mac10.15.5':
|
||||
XCODE_BUILD_VERSION = '11e503a'
|
||||
if os == 'Mac10.15.7':
|
||||
# https://chrome-infra-packages.appspot.com/p/infra_internal/ios/xcode
|
||||
# '12b45b' is not available, so we use '12b5044c'.
|
||||
XCODE_BUILD_VERSION = '12b5044c'
|
||||
extra_cflags.append(
|
||||
'-DDUMMY_xcode_build_version=%s' % XCODE_BUILD_VERSION)
|
||||
mac_toolchain_cmd = api.vars.workdir.join(
|
||||
@ -143,7 +147,7 @@ def compile_fn(api, checkout_root, out_dir):
|
||||
args['skia_generate_workarounds'] = 'true'
|
||||
|
||||
# ccache + clang-tidy.sh chokes on the argument list.
|
||||
if (api.vars.is_linux or os == 'Mac' or os == 'Mac10.15.5') and 'Tidy' not in extra_tokens:
|
||||
if (api.vars.is_linux or os == 'Mac' or os == 'Mac10.15.5' or os == 'Mac10.15.7') and 'Tidy' not in extra_tokens:
|
||||
if api.vars.is_linux:
|
||||
ccache = api.vars.workdir.join('ccache_linux', 'bin', 'ccache')
|
||||
# As of 2020-02-07, the sum of each Debian10-Clang-x86
|
||||
|
@ -3,7 +3,7 @@
|
||||
"cmd": [],
|
||||
"name": "ensure xcode",
|
||||
"~followup_annotations": [
|
||||
"@@@STEP_TEXT@Ensuring Xcode version 11c29 in [START_DIR]/cache/Xcode.app@@@"
|
||||
"@@@STEP_TEXT@Ensuring Xcode version 12b5044c in [START_DIR]/cache/Xcode.app@@@"
|
||||
]
|
||||
},
|
||||
{
|
||||
@ -13,7 +13,7 @@
|
||||
"-kind",
|
||||
"ios",
|
||||
"-xcode-version",
|
||||
"11c29",
|
||||
"12b5044c",
|
||||
"-output-dir",
|
||||
"[START_DIR]/cache/Xcode.app"
|
||||
],
|
||||
@ -42,7 +42,7 @@
|
||||
"--chrome-dir",
|
||||
"[START_DIR]/cache/work",
|
||||
"--output-dir",
|
||||
"[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer/Debug",
|
||||
"[START_DIR]/cache/work/skia/out/Build-Mac10.15.7-Clang-x86_64-Debug-CommandBuffer/Debug",
|
||||
"--extra-gn-args",
|
||||
"mac_sdk_min=\"10.13\"",
|
||||
"--no-sync",
|
||||
@ -90,8 +90,8 @@
|
||||
"cmd": [
|
||||
"[START_DIR]/cache/work/skia/bin/gn",
|
||||
"gen",
|
||||
"[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer/Debug",
|
||||
"--args=cc=\"clang\" cc_wrapper=\"[START_DIR]/ccache_mac/bin/ccache\" cxx=\"clang++\" extra_cflags=[\"-DDUMMY_xcode_build_version=11c29\", \"-O1\"] skia_gl_standard=\"\" target_cpu=\"x86_64\" werror=true"
|
||||
"[START_DIR]/cache/work/skia/out/Build-Mac10.15.7-Clang-x86_64-Debug-CommandBuffer/Debug",
|
||||
"--args=cc=\"clang\" cc_wrapper=\"[START_DIR]/ccache_mac/bin/ccache\" cxx=\"clang++\" extra_cflags=[\"-DDUMMY_xcode_build_version=12b5044c\", \"-O1\"] skia_gl_standard=\"\" target_cpu=\"x86_64\" werror=true"
|
||||
],
|
||||
"cwd": "[START_DIR]/cache/work/skia",
|
||||
"env": {
|
||||
@ -109,7 +109,7 @@
|
||||
"cmd": [
|
||||
"ninja",
|
||||
"-C",
|
||||
"[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer/Debug"
|
||||
"[START_DIR]/cache/work/skia/out/Build-Mac10.15.7-Clang-x86_64-Debug-CommandBuffer/Debug"
|
||||
],
|
||||
"cwd": "[START_DIR]/cache/work/skia",
|
||||
"env": {
|
||||
@ -145,7 +145,7 @@
|
||||
"python",
|
||||
"-u",
|
||||
"import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products = ['dm', 'dm.exe', 'dm.app', 'fm', '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', 'skottie_tool', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products:\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-Mac-Clang-x86_64-Debug-CommandBuffer/Debug",
|
||||
"[START_DIR]/cache/work/skia/out/Build-Mac10.15.7-Clang-x86_64-Debug-CommandBuffer/Debug",
|
||||
"[START_DIR]/[SWARM_OUT_DIR]/out/Debug"
|
||||
],
|
||||
"infra_step": true,
|
@ -65,11 +65,11 @@ TEST_BUILDERS = [
|
||||
'Build-Debian10-EMCC-wasm-Release-CanvasKit_CPU',
|
||||
'Build-Debian10-EMCC-wasm-Release-PathKit',
|
||||
"Build-Mac10.15.5-Clang-arm64-Debug-iOS",
|
||||
'Build-Mac10.15.7-Clang-x86_64-Debug-CommandBuffer',
|
||||
'Build-Mac-Clang-arm-Debug-iOS',
|
||||
'Build-Mac-Clang-arm64-Debug-Android_Vulkan',
|
||||
'Build-Mac-Clang-arm64-Debug-iOS',
|
||||
'Build-Mac-Clang-x86_64-Debug-ASAN',
|
||||
'Build-Mac-Clang-x86_64-Debug-CommandBuffer',
|
||||
'Build-Mac-Clang-x86_64-Debug-Metal',
|
||||
'Build-Win-Clang-arm64-Release-Android',
|
||||
'Build-Win-Clang-x86-Debug-Exceptions',
|
||||
|
@ -451,12 +451,6 @@
|
||||
"Build-Mac-Clang-x86_64-Debug-ASAN_Metal"
|
||||
]
|
||||
},
|
||||
"Build-Mac-Clang-x86_64-Debug-CommandBuffer": {
|
||||
"tasks": [
|
||||
"Build-Mac-Clang-x86_64-Debug-CommandBuffer"
|
||||
],
|
||||
"trigger": "master"
|
||||
},
|
||||
"Build-Mac-Clang-x86_64-Debug-Metal": {
|
||||
"tasks": [
|
||||
"Build-Mac-Clang-x86_64-Debug-Metal"
|
||||
@ -472,12 +466,6 @@
|
||||
"Build-Mac-Clang-x86_64-Release"
|
||||
]
|
||||
},
|
||||
"Build-Mac-Clang-x86_64-Release-CommandBuffer": {
|
||||
"tasks": [
|
||||
"Build-Mac-Clang-x86_64-Release-CommandBuffer"
|
||||
],
|
||||
"trigger": "master"
|
||||
},
|
||||
"Build-Mac-Clang-x86_64-Release-Metal": {
|
||||
"tasks": [
|
||||
"Build-Mac-Clang-x86_64-Release-Metal"
|
||||
@ -513,6 +501,18 @@
|
||||
"Build-Mac10.15.5-Clang-arm64-Release-iOS_Metal"
|
||||
]
|
||||
},
|
||||
"Build-Mac10.15.7-Clang-x86_64-Debug-CommandBuffer": {
|
||||
"tasks": [
|
||||
"Build-Mac10.15.7-Clang-x86_64-Debug-CommandBuffer"
|
||||
],
|
||||
"trigger": "master"
|
||||
},
|
||||
"Build-Mac10.15.7-Clang-x86_64-Release-CommandBuffer": {
|
||||
"tasks": [
|
||||
"Build-Mac10.15.7-Clang-x86_64-Release-CommandBuffer"
|
||||
],
|
||||
"trigger": "master"
|
||||
},
|
||||
"Build-Win-Clang-arm64-Debug": {
|
||||
"tasks": [
|
||||
"Build-Win-Clang-arm64-Debug"
|
||||
@ -10299,114 +10299,6 @@
|
||||
],
|
||||
"service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
|
||||
},
|
||||
"Build-Mac-Clang-x86_64-Debug-CommandBuffer": {
|
||||
"caches": [
|
||||
{
|
||||
"name": "ccache",
|
||||
"path": "cache/ccache"
|
||||
},
|
||||
{
|
||||
"name": "git",
|
||||
"path": "cache/git"
|
||||
},
|
||||
{
|
||||
"name": "git_cache",
|
||||
"path": "cache/git_cache"
|
||||
},
|
||||
{
|
||||
"name": "vpython",
|
||||
"path": "cache/vpython"
|
||||
},
|
||||
{
|
||||
"name": "work",
|
||||
"path": "cache/work"
|
||||
},
|
||||
{
|
||||
"name": "xcode",
|
||||
"path": "cache/Xcode.app"
|
||||
}
|
||||
],
|
||||
"cipd_packages": [
|
||||
{
|
||||
"name": "infra/3pp/tools/git/mac-amd64",
|
||||
"path": "cipd_bin_packages",
|
||||
"version": "version:2.29.2.chromium.6"
|
||||
},
|
||||
{
|
||||
"name": "infra/tools/git/${platform}",
|
||||
"path": "cipd_bin_packages",
|
||||
"version": "git_revision:14be8b751c0fb567535f520f8a7bc60c3f40b378"
|
||||
},
|
||||
{
|
||||
"name": "infra/tools/luci-auth/${platform}",
|
||||
"path": "cipd_bin_packages",
|
||||
"version": "git_revision:14be8b751c0fb567535f520f8a7bc60c3f40b378"
|
||||
},
|
||||
{
|
||||
"name": "infra/tools/luci/git-credential-luci/${platform}",
|
||||
"path": "cipd_bin_packages",
|
||||
"version": "git_revision:14be8b751c0fb567535f520f8a7bc60c3f40b378"
|
||||
},
|
||||
{
|
||||
"name": "infra/tools/luci/kitchen/${platform}",
|
||||
"path": ".",
|
||||
"version": "git_revision:14be8b751c0fb567535f520f8a7bc60c3f40b378"
|
||||
},
|
||||
{
|
||||
"name": "infra/tools/luci/vpython/${platform}",
|
||||
"path": "cipd_bin_packages",
|
||||
"version": "git_revision:14be8b751c0fb567535f520f8a7bc60c3f40b378"
|
||||
},
|
||||
{
|
||||
"name": "infra/tools/mac_toolchain/${platform}",
|
||||
"path": "mac_toolchain",
|
||||
"version": "git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a"
|
||||
},
|
||||
{
|
||||
"name": "skia/bots/ccache_mac",
|
||||
"path": "ccache_mac",
|
||||
"version": "version:1"
|
||||
}
|
||||
],
|
||||
"command": [
|
||||
"cipd_bin_packages/vpython${EXECUTABLE_SUFFIX}",
|
||||
"-u",
|
||||
"skia/infra/bots/run_recipe.py",
|
||||
"${ISOLATED_OUTDIR}",
|
||||
"sync_and_compile",
|
||||
"{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Mac-Clang-x86_64-Debug-CommandBuffer\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}",
|
||||
"skia"
|
||||
],
|
||||
"dependencies": [
|
||||
"Housekeeper-PerCommit-BundleRecipes"
|
||||
],
|
||||
"dimensions": [
|
||||
"cpu:x86-64-E5-2697_v2",
|
||||
"gpu:none",
|
||||
"os:Mac-10.14.6",
|
||||
"pool:Skia"
|
||||
],
|
||||
"env_prefixes": {
|
||||
"PATH": [
|
||||
"cipd_bin_packages",
|
||||
"cipd_bin_packages/bin"
|
||||
],
|
||||
"VPYTHON_VIRTUALENV_ROOT": [
|
||||
"cache/vpython"
|
||||
]
|
||||
},
|
||||
"execution_timeout_ns": 7200000000000,
|
||||
"extra_tags": {
|
||||
"log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
|
||||
},
|
||||
"io_timeout_ns": 7200000000000,
|
||||
"isolate": "swarm_recipe.isolate",
|
||||
"max_attempts": 2,
|
||||
"outputs": [
|
||||
"build"
|
||||
],
|
||||
"service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
|
||||
},
|
||||
"Build-Mac-Clang-x86_64-Debug-Metal": {
|
||||
"caches": [
|
||||
{
|
||||
@ -10653,114 +10545,6 @@
|
||||
],
|
||||
"service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
|
||||
},
|
||||
"Build-Mac-Clang-x86_64-Release-CommandBuffer": {
|
||||
"caches": [
|
||||
{
|
||||
"name": "ccache",
|
||||
"path": "cache/ccache"
|
||||
},
|
||||
{
|
||||
"name": "git",
|
||||
"path": "cache/git"
|
||||
},
|
||||
{
|
||||
"name": "git_cache",
|
||||
"path": "cache/git_cache"
|
||||
},
|
||||
{
|
||||
"name": "vpython",
|
||||
"path": "cache/vpython"
|
||||
},
|
||||
{
|
||||
"name": "work",
|
||||
"path": "cache/work"
|
||||
},
|
||||
{
|
||||
"name": "xcode",
|
||||
"path": "cache/Xcode.app"
|
||||
}
|
||||
],
|
||||
"cipd_packages": [
|
||||
{
|
||||
"name": "infra/3pp/tools/git/mac-amd64",
|
||||
"path": "cipd_bin_packages",
|
||||
"version": "version:2.29.2.chromium.6"
|
||||
},
|
||||
{
|
||||
"name": "infra/tools/git/${platform}",
|
||||
"path": "cipd_bin_packages",
|
||||
"version": "git_revision:14be8b751c0fb567535f520f8a7bc60c3f40b378"
|
||||
},
|
||||
{
|
||||
"name": "infra/tools/luci-auth/${platform}",
|
||||
"path": "cipd_bin_packages",
|
||||
"version": "git_revision:14be8b751c0fb567535f520f8a7bc60c3f40b378"
|
||||
},
|
||||
{
|
||||
"name": "infra/tools/luci/git-credential-luci/${platform}",
|
||||
"path": "cipd_bin_packages",
|
||||
"version": "git_revision:14be8b751c0fb567535f520f8a7bc60c3f40b378"
|
||||
},
|
||||
{
|
||||
"name": "infra/tools/luci/kitchen/${platform}",
|
||||
"path": ".",
|
||||
"version": "git_revision:14be8b751c0fb567535f520f8a7bc60c3f40b378"
|
||||
},
|
||||
{
|
||||
"name": "infra/tools/luci/vpython/${platform}",
|
||||
"path": "cipd_bin_packages",
|
||||
"version": "git_revision:14be8b751c0fb567535f520f8a7bc60c3f40b378"
|
||||
},
|
||||
{
|
||||
"name": "infra/tools/mac_toolchain/${platform}",
|
||||
"path": "mac_toolchain",
|
||||
"version": "git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a"
|
||||
},
|
||||
{
|
||||
"name": "skia/bots/ccache_mac",
|
||||
"path": "ccache_mac",
|
||||
"version": "version:1"
|
||||
}
|
||||
],
|
||||
"command": [
|
||||
"cipd_bin_packages/vpython${EXECUTABLE_SUFFIX}",
|
||||
"-u",
|
||||
"skia/infra/bots/run_recipe.py",
|
||||
"${ISOLATED_OUTDIR}",
|
||||
"sync_and_compile",
|
||||
"{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Mac-Clang-x86_64-Release-CommandBuffer\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}",
|
||||
"skia"
|
||||
],
|
||||
"dependencies": [
|
||||
"Housekeeper-PerCommit-BundleRecipes"
|
||||
],
|
||||
"dimensions": [
|
||||
"cpu:x86-64-E5-2697_v2",
|
||||
"gpu:none",
|
||||
"os:Mac-10.14.6",
|
||||
"pool:Skia"
|
||||
],
|
||||
"env_prefixes": {
|
||||
"PATH": [
|
||||
"cipd_bin_packages",
|
||||
"cipd_bin_packages/bin"
|
||||
],
|
||||
"VPYTHON_VIRTUALENV_ROOT": [
|
||||
"cache/vpython"
|
||||
]
|
||||
},
|
||||
"execution_timeout_ns": 7200000000000,
|
||||
"extra_tags": {
|
||||
"log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
|
||||
},
|
||||
"io_timeout_ns": 7200000000000,
|
||||
"isolate": "swarm_recipe.isolate",
|
||||
"max_attempts": 2,
|
||||
"outputs": [
|
||||
"build"
|
||||
],
|
||||
"service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
|
||||
},
|
||||
"Build-Mac-Clang-x86_64-Release-Metal": {
|
||||
"caches": [
|
||||
{
|
||||
@ -11351,6 +11135,220 @@
|
||||
],
|
||||
"service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
|
||||
},
|
||||
"Build-Mac10.15.7-Clang-x86_64-Debug-CommandBuffer": {
|
||||
"caches": [
|
||||
{
|
||||
"name": "ccache",
|
||||
"path": "cache/ccache"
|
||||
},
|
||||
{
|
||||
"name": "git",
|
||||
"path": "cache/git"
|
||||
},
|
||||
{
|
||||
"name": "git_cache",
|
||||
"path": "cache/git_cache"
|
||||
},
|
||||
{
|
||||
"name": "vpython",
|
||||
"path": "cache/vpython"
|
||||
},
|
||||
{
|
||||
"name": "work",
|
||||
"path": "cache/work"
|
||||
},
|
||||
{
|
||||
"name": "xcode",
|
||||
"path": "cache/Xcode.app"
|
||||
}
|
||||
],
|
||||
"cipd_packages": [
|
||||
{
|
||||
"name": "infra/3pp/tools/git/mac-amd64",
|
||||
"path": "cipd_bin_packages",
|
||||
"version": "version:2.29.2.chromium.6"
|
||||
},
|
||||
{
|
||||
"name": "infra/tools/git/${platform}",
|
||||
"path": "cipd_bin_packages",
|
||||
"version": "git_revision:14be8b751c0fb567535f520f8a7bc60c3f40b378"
|
||||
},
|
||||
{
|
||||
"name": "infra/tools/luci-auth/${platform}",
|
||||
"path": "cipd_bin_packages",
|
||||
"version": "git_revision:14be8b751c0fb567535f520f8a7bc60c3f40b378"
|
||||
},
|
||||
{
|
||||
"name": "infra/tools/luci/git-credential-luci/${platform}",
|
||||
"path": "cipd_bin_packages",
|
||||
"version": "git_revision:14be8b751c0fb567535f520f8a7bc60c3f40b378"
|
||||
},
|
||||
{
|
||||
"name": "infra/tools/luci/kitchen/${platform}",
|
||||
"path": ".",
|
||||
"version": "git_revision:14be8b751c0fb567535f520f8a7bc60c3f40b378"
|
||||
},
|
||||
{
|
||||
"name": "infra/tools/luci/vpython/${platform}",
|
||||
"path": "cipd_bin_packages",
|
||||
"version": "git_revision:14be8b751c0fb567535f520f8a7bc60c3f40b378"
|
||||
},
|
||||
{
|
||||
"name": "infra/tools/mac_toolchain/${platform}",
|
||||
"path": "mac_toolchain",
|
||||
"version": "git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a"
|
||||
},
|
||||
{
|
||||
"name": "skia/bots/ccache_mac",
|
||||
"path": "ccache_mac",
|
||||
"version": "version:1"
|
||||
}
|
||||
],
|
||||
"command": [
|
||||
"cipd_bin_packages/vpython${EXECUTABLE_SUFFIX}",
|
||||
"-u",
|
||||
"skia/infra/bots/run_recipe.py",
|
||||
"${ISOLATED_OUTDIR}",
|
||||
"sync_and_compile",
|
||||
"{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Mac10.15.7-Clang-x86_64-Debug-CommandBuffer\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}",
|
||||
"skia"
|
||||
],
|
||||
"dependencies": [
|
||||
"Housekeeper-PerCommit-BundleRecipes"
|
||||
],
|
||||
"dimensions": [
|
||||
"gpu:none",
|
||||
"os:Mac-10.15.7",
|
||||
"pool:Skia"
|
||||
],
|
||||
"env_prefixes": {
|
||||
"PATH": [
|
||||
"cipd_bin_packages",
|
||||
"cipd_bin_packages/bin"
|
||||
],
|
||||
"VPYTHON_VIRTUALENV_ROOT": [
|
||||
"cache/vpython"
|
||||
]
|
||||
},
|
||||
"execution_timeout_ns": 7200000000000,
|
||||
"extra_tags": {
|
||||
"log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
|
||||
},
|
||||
"io_timeout_ns": 7200000000000,
|
||||
"isolate": "swarm_recipe.isolate",
|
||||
"max_attempts": 2,
|
||||
"outputs": [
|
||||
"build"
|
||||
],
|
||||
"service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
|
||||
},
|
||||
"Build-Mac10.15.7-Clang-x86_64-Release-CommandBuffer": {
|
||||
"caches": [
|
||||
{
|
||||
"name": "ccache",
|
||||
"path": "cache/ccache"
|
||||
},
|
||||
{
|
||||
"name": "git",
|
||||
"path": "cache/git"
|
||||
},
|
||||
{
|
||||
"name": "git_cache",
|
||||
"path": "cache/git_cache"
|
||||
},
|
||||
{
|
||||
"name": "vpython",
|
||||
"path": "cache/vpython"
|
||||
},
|
||||
{
|
||||
"name": "work",
|
||||
"path": "cache/work"
|
||||
},
|
||||
{
|
||||
"name": "xcode",
|
||||
"path": "cache/Xcode.app"
|
||||
}
|
||||
],
|
||||
"cipd_packages": [
|
||||
{
|
||||
"name": "infra/3pp/tools/git/mac-amd64",
|
||||
"path": "cipd_bin_packages",
|
||||
"version": "version:2.29.2.chromium.6"
|
||||
},
|
||||
{
|
||||
"name": "infra/tools/git/${platform}",
|
||||
"path": "cipd_bin_packages",
|
||||
"version": "git_revision:14be8b751c0fb567535f520f8a7bc60c3f40b378"
|
||||
},
|
||||
{
|
||||
"name": "infra/tools/luci-auth/${platform}",
|
||||
"path": "cipd_bin_packages",
|
||||
"version": "git_revision:14be8b751c0fb567535f520f8a7bc60c3f40b378"
|
||||
},
|
||||
{
|
||||
"name": "infra/tools/luci/git-credential-luci/${platform}",
|
||||
"path": "cipd_bin_packages",
|
||||
"version": "git_revision:14be8b751c0fb567535f520f8a7bc60c3f40b378"
|
||||
},
|
||||
{
|
||||
"name": "infra/tools/luci/kitchen/${platform}",
|
||||
"path": ".",
|
||||
"version": "git_revision:14be8b751c0fb567535f520f8a7bc60c3f40b378"
|
||||
},
|
||||
{
|
||||
"name": "infra/tools/luci/vpython/${platform}",
|
||||
"path": "cipd_bin_packages",
|
||||
"version": "git_revision:14be8b751c0fb567535f520f8a7bc60c3f40b378"
|
||||
},
|
||||
{
|
||||
"name": "infra/tools/mac_toolchain/${platform}",
|
||||
"path": "mac_toolchain",
|
||||
"version": "git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a"
|
||||
},
|
||||
{
|
||||
"name": "skia/bots/ccache_mac",
|
||||
"path": "ccache_mac",
|
||||
"version": "version:1"
|
||||
}
|
||||
],
|
||||
"command": [
|
||||
"cipd_bin_packages/vpython${EXECUTABLE_SUFFIX}",
|
||||
"-u",
|
||||
"skia/infra/bots/run_recipe.py",
|
||||
"${ISOLATED_OUTDIR}",
|
||||
"sync_and_compile",
|
||||
"{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Mac10.15.7-Clang-x86_64-Release-CommandBuffer\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}",
|
||||
"skia"
|
||||
],
|
||||
"dependencies": [
|
||||
"Housekeeper-PerCommit-BundleRecipes"
|
||||
],
|
||||
"dimensions": [
|
||||
"gpu:none",
|
||||
"os:Mac-10.15.7",
|
||||
"pool:Skia"
|
||||
],
|
||||
"env_prefixes": {
|
||||
"PATH": [
|
||||
"cipd_bin_packages",
|
||||
"cipd_bin_packages/bin"
|
||||
],
|
||||
"VPYTHON_VIRTUALENV_ROOT": [
|
||||
"cache/vpython"
|
||||
]
|
||||
},
|
||||
"execution_timeout_ns": 7200000000000,
|
||||
"extra_tags": {
|
||||
"log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
|
||||
},
|
||||
"io_timeout_ns": 7200000000000,
|
||||
"isolate": "swarm_recipe.isolate",
|
||||
"max_attempts": 2,
|
||||
"outputs": [
|
||||
"build"
|
||||
],
|
||||
"service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
|
||||
},
|
||||
"Build-Win-Clang-arm64-Debug": {
|
||||
"caches": [
|
||||
{
|
||||
@ -21911,7 +21909,7 @@
|
||||
"skia"
|
||||
],
|
||||
"dependencies": [
|
||||
"Build-Mac-Clang-x86_64-Release-CommandBuffer",
|
||||
"Build-Mac10.15.7-Clang-x86_64-Release-CommandBuffer",
|
||||
"Housekeeper-PerCommit-BundleRecipes"
|
||||
],
|
||||
"dimensions": [
|
||||
@ -22145,7 +22143,7 @@
|
||||
"skia"
|
||||
],
|
||||
"dependencies": [
|
||||
"Build-Mac-Clang-x86_64-Release-CommandBuffer",
|
||||
"Build-Mac10.15.7-Clang-x86_64-Release-CommandBuffer",
|
||||
"Housekeeper-PerCommit-BundleRecipes"
|
||||
],
|
||||
"dimensions": [
|
||||
@ -22302,7 +22300,7 @@
|
||||
"skia"
|
||||
],
|
||||
"dependencies": [
|
||||
"Build-Mac-Clang-x86_64-Release-CommandBuffer",
|
||||
"Build-Mac10.15.7-Clang-x86_64-Release-CommandBuffer",
|
||||
"Housekeeper-PerCommit-BundleRecipes"
|
||||
],
|
||||
"dimensions": [
|
||||
@ -22459,7 +22457,7 @@
|
||||
"skia"
|
||||
],
|
||||
"dependencies": [
|
||||
"Build-Mac-Clang-x86_64-Release-CommandBuffer",
|
||||
"Build-Mac10.15.7-Clang-x86_64-Release-CommandBuffer",
|
||||
"Housekeeper-PerCommit-BundleRecipes"
|
||||
],
|
||||
"dimensions": [
|
||||
@ -39157,7 +39155,7 @@
|
||||
"skia"
|
||||
],
|
||||
"dependencies": [
|
||||
"Build-Mac-Clang-x86_64-Debug-CommandBuffer",
|
||||
"Build-Mac10.15.7-Clang-x86_64-Debug-CommandBuffer",
|
||||
"Housekeeper-PerCommit-BundleRecipes"
|
||||
],
|
||||
"dimensions": [
|
||||
@ -39859,7 +39857,7 @@
|
||||
"skia"
|
||||
],
|
||||
"dependencies": [
|
||||
"Build-Mac-Clang-x86_64-Debug-CommandBuffer",
|
||||
"Build-Mac10.15.7-Clang-x86_64-Debug-CommandBuffer",
|
||||
"Housekeeper-PerCommit-BundleRecipes"
|
||||
],
|
||||
"dimensions": [
|
||||
@ -40250,7 +40248,7 @@
|
||||
"skia"
|
||||
],
|
||||
"dependencies": [
|
||||
"Build-Mac-Clang-x86_64-Debug-CommandBuffer",
|
||||
"Build-Mac10.15.7-Clang-x86_64-Debug-CommandBuffer",
|
||||
"Housekeeper-PerCommit-BundleRecipes"
|
||||
],
|
||||
"dimensions": [
|
||||
@ -40720,7 +40718,7 @@
|
||||
"skia"
|
||||
],
|
||||
"dependencies": [
|
||||
"Build-Mac-Clang-x86_64-Debug-CommandBuffer",
|
||||
"Build-Mac10.15.7-Clang-x86_64-Debug-CommandBuffer",
|
||||
"Housekeeper-PerCommit-BundleRecipes"
|
||||
],
|
||||
"dimensions": [
|
||||
|
Loading…
Reference in New Issue
Block a user