Reland "[infra] Use Mac10.15.7 and xcode12.3 for all builds."
This is a reland of f5aed172c6
Original change's description:
> [infra] Use Mac10.15.7 and xcode12.3 for all builds.
>
> Bug: skia:11129
> Change-Id: I314d51988e4cafc9dfea60bc70a57f46faa8666a
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/345396
> Reviewed-by: Eric Boren <borenet@google.com>
Bug: skia:11129
Change-Id: I00bca0407ff7522bafca3f4e4e0aa92c239043fa
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/353036
Reviewed-by: Eric Boren <borenet@google.com>
This commit is contained in:
Weston Tracey
parent
c96e5707d8
commit
fff4099358
@ -43,7 +43,7 @@ const (
|
||||
OLD_OS_LINUX_GCE = "Debian-9.8"
|
||||
COMPILE_TASK_NAME_OS_LINUX = "Debian10"
|
||||
COMPILE_TASK_NAME_OS_LINUX_OLD = "Debian9"
|
||||
DEFAULT_OS_MAC = "Mac-10.14.6"
|
||||
DEFAULT_OS_MAC = "Mac-10.15.7"
|
||||
DEFAULT_OS_WIN = "Windows-Server-17763"
|
||||
|
||||
// Small is a 2-core machine.
|
||||
@ -469,11 +469,6 @@ func (b *jobBuilder) deriveCompileTaskName() string {
|
||||
} else if b.os("iOS") {
|
||||
ec = append([]string{task_os}, ec...)
|
||||
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") {
|
||||
task_os = "Win"
|
||||
} else if b.compiler("GCC") {
|
||||
@ -484,9 +479,6 @@ 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",
|
||||
@ -547,9 +539,7 @@ func (b *taskBuilder) defaultSwarmDimensions() {
|
||||
"Mac": DEFAULT_OS_MAC,
|
||||
"Mac10.13": "Mac-10.13.6",
|
||||
"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
|
||||
"Mac10.15.1": "Mac-10.15.1",
|
||||
"Ubuntu18": "Ubuntu-18.04",
|
||||
"Win": DEFAULT_OS_WIN,
|
||||
"Win10": "Windows-10-18363",
|
||||
|
||||
@ -76,10 +76,6 @@
|
||||
"Build-Debian10-EMCC-wasm-Release-CanvasKit_CPU",
|
||||
"Build-Debian10-EMCC-wasm-Release-PathKit",
|
||||
"Build-Debian10-EMCC-wasm-Release-WasmGMTests",
|
||||
"Build-Mac10.15.5-Clang-arm64-Debug-iOS",
|
||||
"Build-Mac10.15.5-Clang-arm64-Debug-iOS_Metal",
|
||||
"Build-Mac10.15.5-Clang-arm64-Release-iOS",
|
||||
"Build-Mac10.15.5-Clang-arm64-Release-iOS_Metal",
|
||||
"Build-Mac-Clang-arm64-Debug",
|
||||
"Build-Mac-Clang-arm64-Debug-Android",
|
||||
"Build-Mac-Clang-arm64-Debug-iOS",
|
||||
@ -91,11 +87,11 @@
|
||||
"Build-Mac-Clang-x86_64-Debug",
|
||||
"Build-Mac-Clang-x86_64-Debug-ASAN",
|
||||
"Build-Mac-Clang-x86_64-Debug-ASAN_Metal",
|
||||
"Build-Mac10.15.7-Clang-x86_64-Debug-CommandBuffer",
|
||||
"Build-Mac-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-Mac10.15.7-Clang-x86_64-Release-CommandBuffer",
|
||||
"Build-Mac-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",
|
||||
@ -247,9 +243,9 @@
|
||||
"Perf-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-CommandBuffer",
|
||||
"Perf-Mac10.13-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All",
|
||||
"Perf-Mac10.13-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All-CommandBuffer",
|
||||
"Perf-Mac10.15-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All",
|
||||
"Perf-Mac10.15-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-CommandBuffer",
|
||||
"Perf-Mac10.15-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-Metal",
|
||||
"Perf-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All",
|
||||
"Perf-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-CommandBuffer",
|
||||
"Perf-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-Metal",
|
||||
"Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ASAN",
|
||||
"Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All",
|
||||
"Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ASAN",
|
||||
@ -480,21 +476,21 @@
|
||||
"Test-Mac10.13-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All",
|
||||
"Test-Mac10.13-Clang-VMware7.1-CPU-AVX-x86_64-Debug-All-NativeFonts",
|
||||
"Test-Mac10.14-Clang-VMware7.1-CPU-AVX-x86_64-Debug-All-NativeFonts",
|
||||
"Test-Mac10.15-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All",
|
||||
"Test-Mac10.15-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-CommandBuffer",
|
||||
"Test-Mac10.15-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-ASAN_Metal",
|
||||
"Test-Mac10.15-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-DDL1_Metal",
|
||||
"Test-Mac10.15-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-DDL3_Metal",
|
||||
"Test-Mac10.15-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-Metal",
|
||||
"Test-Mac10.15-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-NativeFonts",
|
||||
"Test-Mac10.15-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-OOPRDDL_Metal",
|
||||
"Test-Mac10.15-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All",
|
||||
"Test-Mac10.15-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-DDL1_Metal",
|
||||
"Test-Mac10.15-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-DDL3_Metal",
|
||||
"Test-Mac10.15-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-Metal",
|
||||
"Test-Mac10.15-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-OOPRDDL_Metal",
|
||||
"Test-Mac10.15-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-TSAN_Metal",
|
||||
"Test-Mac10.15-Clang-VMware7.1-CPU-AVX-x86_64-Debug-All-NativeFonts",
|
||||
"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All",
|
||||
"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-CommandBuffer",
|
||||
"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-ASAN_Metal",
|
||||
"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-DDL1_Metal",
|
||||
"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-DDL3_Metal",
|
||||
"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-Metal",
|
||||
"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-NativeFonts",
|
||||
"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-OOPRDDL_Metal",
|
||||
"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All",
|
||||
"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-DDL1_Metal",
|
||||
"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-DDL3_Metal",
|
||||
"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-Metal",
|
||||
"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-OOPRDDL_Metal",
|
||||
"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-TSAN_Metal",
|
||||
"Test-Mac10.15.1-Clang-VMware7.1-CPU-AVX-x86_64-Debug-All-NativeFonts",
|
||||
"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ASAN",
|
||||
"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1",
|
||||
"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1_Vulkan",
|
||||
|
||||
@ -94,18 +94,13 @@ def compile_fn(api, checkout_root, out_dir):
|
||||
args = {'werror': 'true'}
|
||||
env = {}
|
||||
|
||||
if os == 'Mac' or os == 'Mac10.15.5' or os == 'Mac10.15.7':
|
||||
if os == 'Mac':
|
||||
# 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
|
||||
# Use lowercase letters.
|
||||
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'
|
||||
XCODE_BUILD_VERSION = '12c33'
|
||||
extra_cflags.append(
|
||||
'-DDUMMY_xcode_build_version=%s' % XCODE_BUILD_VERSION)
|
||||
mac_toolchain_cmd = api.vars.workdir.join(
|
||||
|
||||
@ -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 12c33 in [START_DIR]/cache/Xcode.app@@@"
|
||||
]
|
||||
},
|
||||
{
|
||||
@ -13,7 +13,7 @@
|
||||
"-kind",
|
||||
"ios",
|
||||
"-xcode-version",
|
||||
"11c29",
|
||||
"12c33",
|
||||
"-output-dir",
|
||||
"[START_DIR]/cache/Xcode.app"
|
||||
],
|
||||
@ -70,7 +70,7 @@
|
||||
"[START_DIR]/cache/work/skia/bin/gn",
|
||||
"gen",
|
||||
"[START_DIR]/cache/work/skia/out/Build-Mac-Clang-arm64-Debug-iOS/Debug",
|
||||
"--args=cc=\"clang\" cc_wrapper=\"[START_DIR]/ccache_mac/bin/ccache\" cxx=\"clang++\" extra_cflags=[\"-DDUMMY_xcode_build_version=11c29\", \"-O1\"] skia_ios_identity=\".*GS9WA.*\" skia_ios_profile=\"[START_DIR]/provisioning_profile_ios/Upstream_Testing_Provisioning_Profile.mobileprovision\" target_cpu=\"arm64\" target_os=\"ios\" werror=true"
|
||||
"--args=cc=\"clang\" cc_wrapper=\"[START_DIR]/ccache_mac/bin/ccache\" cxx=\"clang++\" extra_cflags=[\"-DDUMMY_xcode_build_version=12c33\", \"-O1\"] skia_ios_identity=\".*GS9WA.*\" skia_ios_profile=\"[START_DIR]/provisioning_profile_ios/Upstream_Testing_Provisioning_Profile.mobileprovision\" target_cpu=\"arm64\" target_os=\"ios\" werror=true"
|
||||
],
|
||||
"cwd": "[START_DIR]/cache/work/skia",
|
||||
"env": {
|
||||
|
||||
@ -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 12c33 in [START_DIR]/cache/Xcode.app@@@"
|
||||
]
|
||||
},
|
||||
{
|
||||
@ -13,7 +13,7 @@
|
||||
"-kind",
|
||||
"ios",
|
||||
"-xcode-version",
|
||||
"11c29",
|
||||
"12c33",
|
||||
"-output-dir",
|
||||
"[START_DIR]/cache/Xcode.app"
|
||||
],
|
||||
@ -70,7 +70,7 @@
|
||||
"[START_DIR]/cache/work/skia/bin/gn",
|
||||
"gen",
|
||||
"[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x86_64-Debug-ASAN/Debug",
|
||||
"--args=cc=\"clang\" cc_wrapper=\"[START_DIR]/ccache_mac/bin/ccache\" cxx=\"clang++\" extra_cflags=[\"-DDUMMY_xcode_build_version=11c29\", \"-O1\"] sanitize=\"ASAN\" skia_enable_spirv_validation=false target_cpu=\"x86_64\" werror=true"
|
||||
"--args=cc=\"clang\" cc_wrapper=\"[START_DIR]/ccache_mac/bin/ccache\" cxx=\"clang++\" extra_cflags=[\"-DDUMMY_xcode_build_version=12c33\", \"-O1\"] sanitize=\"ASAN\" skia_enable_spirv_validation=false target_cpu=\"x86_64\" werror=true"
|
||||
],
|
||||
"cwd": "[START_DIR]/cache/work/skia",
|
||||
"env": {
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
"cmd": [],
|
||||
"name": "ensure xcode",
|
||||
"~followup_annotations": [
|
||||
"@@@STEP_TEXT@Ensuring Xcode version 12b5044c in [START_DIR]/cache/Xcode.app@@@"
|
||||
"@@@STEP_TEXT@Ensuring Xcode version 12c33 in [START_DIR]/cache/Xcode.app@@@"
|
||||
]
|
||||
},
|
||||
{
|
||||
@ -13,7 +13,7 @@
|
||||
"-kind",
|
||||
"ios",
|
||||
"-xcode-version",
|
||||
"12b5044c",
|
||||
"12c33",
|
||||
"-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-Mac10.15.7-Clang-x86_64-Debug-CommandBuffer/Debug",
|
||||
"[START_DIR]/cache/work/skia/out/Build-Mac-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-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"
|
||||
"[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=12c33\", \"-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-Mac10.15.7-Clang-x86_64-Debug-CommandBuffer/Debug"
|
||||
"[START_DIR]/cache/work/skia/out/Build-Mac-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-Mac10.15.7-Clang-x86_64-Debug-CommandBuffer/Debug",
|
||||
"[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer/Debug",
|
||||
"[START_DIR]/[SWARM_OUT_DIR]/out/Debug"
|
||||
],
|
||||
"infra_step": true,
|
||||
@ -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 12c33 in [START_DIR]/cache/Xcode.app@@@"
|
||||
]
|
||||
},
|
||||
{
|
||||
@ -13,7 +13,7 @@
|
||||
"-kind",
|
||||
"ios",
|
||||
"-xcode-version",
|
||||
"11c29",
|
||||
"12c33",
|
||||
"-output-dir",
|
||||
"[START_DIR]/cache/Xcode.app"
|
||||
],
|
||||
@ -70,7 +70,7 @@
|
||||
"[START_DIR]/cache/work/skia/bin/gn",
|
||||
"gen",
|
||||
"[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x86_64-Debug-Metal/Debug",
|
||||
"--args=cc=\"clang\" cc_wrapper=\"[START_DIR]/ccache_mac/bin/ccache\" cxx=\"clang++\" extra_cflags=[\"-DDUMMY_xcode_build_version=11c29\", \"-O1\"] skia_use_gl=false skia_use_metal=true target_cpu=\"x86_64\" werror=true"
|
||||
"--args=cc=\"clang\" cc_wrapper=\"[START_DIR]/ccache_mac/bin/ccache\" cxx=\"clang++\" extra_cflags=[\"-DDUMMY_xcode_build_version=12c33\", \"-O1\"] skia_use_gl=false skia_use_metal=true target_cpu=\"x86_64\" werror=true"
|
||||
],
|
||||
"cwd": "[START_DIR]/cache/work/skia",
|
||||
"env": {
|
||||
|
||||
@ -1,163 +0,0 @@
|
||||
[
|
||||
{
|
||||
"cmd": [],
|
||||
"name": "ensure xcode",
|
||||
"~followup_annotations": [
|
||||
"@@@STEP_TEXT@Ensuring Xcode version 11e503a in [START_DIR]/cache/Xcode.app@@@"
|
||||
]
|
||||
},
|
||||
{
|
||||
"cmd": [
|
||||
"[START_DIR]/mac_toolchain/mac_toolchain",
|
||||
"install",
|
||||
"-kind",
|
||||
"ios",
|
||||
"-xcode-version",
|
||||
"11e503a",
|
||||
"-output-dir",
|
||||
"[START_DIR]/cache/Xcode.app"
|
||||
],
|
||||
"name": "ensure xcode.install xcode",
|
||||
"~followup_annotations": [
|
||||
"@@@STEP_NEST_LEVEL@1@@@"
|
||||
]
|
||||
},
|
||||
{
|
||||
"cmd": [
|
||||
"sudo",
|
||||
"xcode-select",
|
||||
"-switch",
|
||||
"[START_DIR]/cache/Xcode.app"
|
||||
],
|
||||
"name": "ensure xcode.select xcode",
|
||||
"~followup_annotations": [
|
||||
"@@@STEP_NEST_LEVEL@1@@@"
|
||||
]
|
||||
},
|
||||
{
|
||||
"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]/ccache_mac/bin/ccache",
|
||||
"-s"
|
||||
],
|
||||
"cwd": "[START_DIR]/cache/work/skia",
|
||||
"env": {
|
||||
"CCACHE_COMPILERCHECK": "content",
|
||||
"CCACHE_DIR": "[START_DIR]/cache/ccache",
|
||||
"CCACHE_MAXFILES": "0",
|
||||
"CCACHE_MAXSIZE": "50G",
|
||||
"CHROME_HEADLESS": "1",
|
||||
"IPHONEOS_DEPLOYMENT_TARGET": "11.0",
|
||||
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
|
||||
},
|
||||
"name": "ccache stats-start"
|
||||
},
|
||||
{
|
||||
"cmd": [
|
||||
"[START_DIR]/cache/work/skia/bin/gn",
|
||||
"gen",
|
||||
"[START_DIR]/cache/work/skia/out/Build-Mac10.15.5-Clang-arm64-Debug-iOS/Debug",
|
||||
"--args=cc=\"clang\" cc_wrapper=\"[START_DIR]/ccache_mac/bin/ccache\" cxx=\"clang++\" extra_cflags=[\"-DDUMMY_xcode_build_version=11e503a\", \"-O1\"] skia_ios_identity=\".*GS9WA.*\" skia_ios_profile=\"[START_DIR]/provisioning_profile_ios/Upstream_Testing_Provisioning_Profile.mobileprovision\" target_cpu=\"arm64\" target_os=\"ios\" werror=true"
|
||||
],
|
||||
"cwd": "[START_DIR]/cache/work/skia",
|
||||
"env": {
|
||||
"CCACHE_COMPILERCHECK": "content",
|
||||
"CCACHE_DIR": "[START_DIR]/cache/ccache",
|
||||
"CCACHE_MAXFILES": "0",
|
||||
"CCACHE_MAXSIZE": "50G",
|
||||
"CHROME_HEADLESS": "1",
|
||||
"IPHONEOS_DEPLOYMENT_TARGET": "11.0",
|
||||
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
|
||||
},
|
||||
"name": "gn gen"
|
||||
},
|
||||
{
|
||||
"cmd": [
|
||||
"ninja",
|
||||
"-C",
|
||||
"[START_DIR]/cache/work/skia/out/Build-Mac10.15.5-Clang-arm64-Debug-iOS/Debug"
|
||||
],
|
||||
"cwd": "[START_DIR]/cache/work/skia",
|
||||
"env": {
|
||||
"CCACHE_COMPILERCHECK": "content",
|
||||
"CCACHE_DIR": "[START_DIR]/cache/ccache",
|
||||
"CCACHE_MAXFILES": "0",
|
||||
"CCACHE_MAXSIZE": "50G",
|
||||
"CHROME_HEADLESS": "1",
|
||||
"IPHONEOS_DEPLOYMENT_TARGET": "11.0",
|
||||
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
|
||||
},
|
||||
"name": "ninja"
|
||||
},
|
||||
{
|
||||
"cmd": [
|
||||
"[START_DIR]/ccache_mac/bin/ccache",
|
||||
"-s"
|
||||
],
|
||||
"cwd": "[START_DIR]/cache/work/skia",
|
||||
"env": {
|
||||
"CCACHE_COMPILERCHECK": "content",
|
||||
"CCACHE_DIR": "[START_DIR]/cache/ccache",
|
||||
"CCACHE_MAXFILES": "0",
|
||||
"CCACHE_MAXSIZE": "50G",
|
||||
"CHROME_HEADLESS": "1",
|
||||
"IPHONEOS_DEPLOYMENT_TARGET": "11.0",
|
||||
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
|
||||
},
|
||||
"name": "ccache stats-end"
|
||||
},
|
||||
{
|
||||
"cmd": [
|
||||
"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-Mac10.15.5-Clang-arm64-Debug-iOS/Debug",
|
||||
"[START_DIR]/[SWARM_OUT_DIR]/out/Debug"
|
||||
],
|
||||
"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 = ['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']@@@",
|
||||
"@@@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:@@@",
|
||||
"@@@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"
|
||||
}
|
||||
]
|
||||
@ -64,11 +64,10 @@ TEST_BUILDERS = [
|
||||
'Build-Debian10-EMCC-wasm-Debug-PathKit',
|
||||
'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-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',
|
||||
|
||||
@ -163,7 +163,7 @@
|
||||
"cmd": [],
|
||||
"name": "ensure xcode",
|
||||
"~followup_annotations": [
|
||||
"@@@STEP_TEXT@Ensuring Xcode version 11c29 in [START_DIR]/cache/Xcode.app@@@"
|
||||
"@@@STEP_TEXT@Ensuring Xcode version 12c33 in [START_DIR]/cache/Xcode.app@@@"
|
||||
]
|
||||
},
|
||||
{
|
||||
@ -173,7 +173,7 @@
|
||||
"-kind",
|
||||
"ios",
|
||||
"-xcode-version",
|
||||
"11c29",
|
||||
"12c33",
|
||||
"-output-dir",
|
||||
"[START_DIR]/cache/Xcode.app"
|
||||
],
|
||||
@ -251,7 +251,7 @@
|
||||
"[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"
|
||||
"--args=cc=\"clang\" cc_wrapper=\"[START_DIR]/ccache_mac/bin/ccache\" cxx=\"clang++\" extra_cflags=[\"-DDUMMY_xcode_build_version=12c33\", \"-O1\"] skia_gl_standard=\"\" target_cpu=\"x86_64\" werror=true"
|
||||
],
|
||||
"cwd": "[START_DIR]/cache/work/skia",
|
||||
"env": {
|
||||
|
||||
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue
Block a user