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

remove 32-bit iOS builders

Browse Source 
32-bit builds are not supported since iOS 11.
We don't have any test or perf bots, just these leftovers.

Change-Id: I529a61d84b5f6a826a7176f6820cfc9fbc359339
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/345457
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
This commit is contained in:
Mike Klein 2020-12-17 14:21:29 -06:00 committed by Skia Commit-Bot
parent 1efa14d9f4
commit 0755d4bcde
5 changed files with 2 additions and 357 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
infra/bots/jobs.json
View File

@ -80,8 +80,6 @@
"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-arm-Debug-iOS",
"Build-Mac-Clang-arm-Release-iOS",
"Build-Mac-Clang-arm64-Debug",
"Build-Mac-Clang-arm64-Debug-Android",
"Build-Mac-Clang-arm64-Debug-iOS",

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

@ -129,13 +129,8 @@ def compile_fn(api, checkout_root, out_dir):
api.step('select xcode', [
'sudo', 'xcode-select', '-switch', xcode_app_path])
if 'iOS' in extra_tokens:
if target_arch == 'arm':
# Can only compile for 32-bit up to iOS 10.
env['IPHONEOS_DEPLOYMENT_TARGET'] = '10.0'
else:
# Our iOS devices are on an older version.
# Can't compile for Metal before 11.0.
env['IPHONEOS_DEPLOYMENT_TARGET'] = '11.0'
# Can't compile for Metal before 11.0.
env['IPHONEOS_DEPLOYMENT_TARGET'] = '11.0'
else:
# We have some bots on 10.13.
env['MACOSX_DEPLOYMENT_TARGET'] = '10.13'

163
infra/bots/recipe_modules/build/examples/full.expected/Build-Mac-Clang-arm-Debug-iOS.json
View File

@ -1,163 +0,0 @@
[
{
"cmd": [],
"name": "ensure xcode",
"~followup_annotations": [
"@@@STEP_TEXT@Ensuring Xcode version 11c29 in [START_DIR]/cache/Xcode.app@@@"
]
},
{
"cmd": [
"[START_DIR]/mac_toolchain/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"11c29",
"-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": "10.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-Mac-Clang-arm-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=\"arm\" 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": "10.0",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"name": "gn gen"
},
{
"cmd": [
"ninja",
"-C",
"[START_DIR]/cache/work/skia/out/Build-Mac-Clang-arm-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": "10.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": "10.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-Mac-Clang-arm-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"
}
]

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

@ -66,7 +66,6 @@ TEST_BUILDERS = [
'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',

184
infra/bots/tasks.json
View File

@ -386,16 +386,6 @@
"Build-Debian9-Clang-x86_64-Release-Chromebook_GLES_Docker"
]
},
"Build-Mac-Clang-arm-Debug-iOS": {
"tasks": [
"Build-Mac-Clang-arm-Debug-iOS"
]
},
"Build-Mac-Clang-arm-Release-iOS": {
"tasks": [
"Build-Mac-Clang-arm-Release-iOS"
]
},
"Build-Mac-Clang-arm64-Debug": {
"tasks": [
"Build-Mac-Clang-arm64-Debug"
@ -9231,180 +9221,6 @@
],
"service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
},
"Build-Mac-Clang-arm-Debug-iOS": {
"caches": [
{
"name": "ccache",
"path": "cache/ccache"
},
{
"name": "vpython",
"path": "cache/vpython"
},
{
"name": "xcode",
"path": "cache/Xcode.app"
}
],
"cipd_packages": [
{
"name": "infra/tools/luci-auth/${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"
},
{
"name": "skia/bots/provisioning_profile_ios",
"path": "provisioning_profile_ios",
"version": "version:4"
}
],
"command": [
"cipd_bin_packages/vpython${EXECUTABLE_SUFFIX}",
"-u",
"skia/infra/bots/run_recipe.py",
"${ISOLATED_OUTDIR}",
"compile",
"{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-arm-Debug-iOS\",\"swarm_out_dir\":\"build\"}",
"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": 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-Mac-Clang-arm-Release-iOS": {
"caches": [
{
"name": "ccache",
"path": "cache/ccache"
},
{
"name": "vpython",
"path": "cache/vpython"
},
{
"name": "xcode",
"path": "cache/Xcode.app"
}
],
"cipd_packages": [
{
"name": "infra/tools/luci-auth/${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"
},
{
"name": "skia/bots/provisioning_profile_ios",
"path": "provisioning_profile_ios",
"version": "version:4"
}
],
"command": [
"cipd_bin_packages/vpython${EXECUTABLE_SUFFIX}",
"-u",
"skia/infra/bots/run_recipe.py",
"${ISOLATED_OUTDIR}",
"compile",
"{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-arm-Release-iOS\",\"swarm_out_dir\":\"build\"}",
"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": 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-Mac-Clang-arm64-Debug": {
"caches": [
{