Skip to content

C
Chromium_Depot_tools
Commit f31cb801 authored by Robert Iannucci's avatar Robert Iannucci Committed by Commit Bot
Browse files
Options

[recipe_modules/osx_sdk] Better default XCode versions depending on host OS. 

This uses the macOS<->XCode mapping from wikipedia to set the default XCode
version to the highest supported XCode version supported by the current
host OS.

R=justincohen@google.com, tandrii@chromium.org

Bug: 1026340
Recipe-Nontrivial-Roll: build
Recipe-Nontrivial-Roll: infra
Recipe-Nontrivial-Roll: build_limited_scripts_slave
Change-Id: I524d08f81a7778404c60a64b1100b4386a2ed79a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1938022Reviewed-by: 's avatarAndrii Shyshkalov <tandrii@google.com>
Commit-Queue: Robbie Iannucci <iannucci@chromium.org>
parent 34267f83
Hide whitespace changes
Inline Side-by-side
Showing with 305 additions and 14 deletions
recipes/README.recipes.md
View file @ f31cb801
......@@ -693,18 +693,18 @@ uses the more generic [CACHE]/git path (LUCI world).
&mdash; **def [initialize](/recipes/recipe_modules/infra_paths/api.py#11)(self):**
### *recipe_modules* / [osx\_sdk](/recipes/recipe_modules/osx_sdk)
[DEPS](/recipes/recipe_modules/osx_sdk/__init__.py#5): [recipe\_engine/cipd][recipe_engine/recipe_modules/cipd], [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/json][recipe_engine/recipe_modules/json], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/step][recipe_engine/recipe_modules/step]
[DEPS](/recipes/recipe_modules/osx_sdk/__init__.py#5): [recipe\_engine/cipd][recipe_engine/recipe_modules/cipd], [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/json][recipe_engine/recipe_modules/json], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/step][recipe_engine/recipe_modules/step], [recipe\_engine/version][recipe_engine/recipe_modules/version]
The `osx_sdk` module provides safe functions to access a semi-hermetic
XCode installation.
Available only to Google-run bots.
#### **class [OSXSDKApi](/recipes/recipe_modules/osx_sdk/api.py#24)([RecipeApi][recipe_engine/wkt/RecipeApi]):**
#### **class [OSXSDKApi](/recipes/recipe_modules/osx_sdk/api.py#35)([RecipeApi][recipe_engine/wkt/RecipeApi]):**
API for using OS X SDK distributed via CIPD.
&emsp; **@contextmanager**<br>&mdash; **def [\_\_call\_\_](/recipes/recipe_modules/osx_sdk/api.py#37)(self, kind):**
&emsp; **@contextmanager**<br>&mdash; **def [\_\_call\_\_](/recipes/recipe_modules/osx_sdk/api.py#61)(self, kind):**
Sets up the XCode SDK environment.
......@@ -751,6 +751,8 @@ Args:
Raises:
StepFailure or InfraFailure.
&mdash; **def [initialize](/recipes/recipe_modules/osx_sdk/api.py#46)(self):**
### *recipe_modules* / [presubmit](/recipes/recipe_modules/presubmit)
[DEPS](/recipes/recipe_modules/presubmit/__init__.py#11): [bot\_update](#recipe_modules-bot_update), [depot\_tools](#recipe_modules-depot_tools), [gclient](#recipe_modules-gclient), [git](#recipe_modules-git), [tryserver](#recipe_modules-tryserver), [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/cq][recipe_engine/recipe_modules/cq], [recipe\_engine/json][recipe_engine/recipe_modules/json], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/python][recipe_engine/recipe_modules/python], [recipe\_engine/step][recipe_engine/recipe_modules/step]
......@@ -1086,4 +1088,5 @@ Move things around in a loop!
[recipe_engine/recipe_modules/source_manifest]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c48c77264fea1fbe3bdc8352451a91b3dd529c96/README.recipes.md#recipe_modules-source_manifest
[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c48c77264fea1fbe3bdc8352451a91b3dd529c96/README.recipes.md#recipe_modules-step
[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c48c77264fea1fbe3bdc8352451a91b3dd529c96/README.recipes.md#recipe_modules-url
[recipe_engine/recipe_modules/version]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c48c77264fea1fbe3bdc8352451a91b3dd529c96/README.recipes.md#recipe_modules-version
[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c48c77264fea1fbe3bdc8352451a91b3dd529c96/recipe_engine/recipe_api.py#871
recipes/recipe_modules/osx_sdk/__init__.py
View file @ f31cb801
......@@ -9,6 +9,7 @@ DEPS = [
'recipe_engine/path',
'recipe_engine/platform',
'recipe_engine/step',
'recipe_engine/version',
]
from recipe_engine.recipe_api import Property
......
recipes/recipe_modules/osx_sdk/api.py
View file @ f31cb801
......@@ -14,25 +14,49 @@ from recipe_engine import recipe_api
# TODO(iannucci): replace this with something sane when PROPERTIES is
# implemented with a proto message.
_PROPERTY_DEFAULTS = {
'sdk_version': '9c40b',
'toolchain_pkg': 'infra/tools/mac_toolchain/${platform}',
'toolchain_ver': 'git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a',
'toolchain_ver': 'git_revision:9a1adc55bf4a1173784da3ba2f8cb06421606748',
}
# Rationalized from https://en.wikipedia.org/wiki/Xcode.
#
# Maps from OS version to the maximum supported version of Xcode for that OS.
#
# Keep this sorted by OS version.
_DEFAULT_VERSION_MAP = [
('10.12.6', '9c40b'),
('10.13.2', '9f2000'),
('10.13.6', '10b61'),
('10.14.3', '10g8'),
('10.14.4', '11b52'),
]
class OSXSDKApi(recipe_api.RecipeApi):
"""API for using OS X SDK distributed via CIPD."""
def __init__(self, sdk_properties, *args, **kwargs):
super(OSXSDKApi, self).__init__(*args, **kwargs)
self._sdk_properties = _PROPERTY_DEFAULTS.copy()
self._sdk_properties.update(sdk_properties)
self._sdk_version = None
self._tool_pkg = self._sdk_properties['toolchain_pkg']
self._tool_ver = self._sdk_properties['toolchain_ver']
actual_props = _PROPERTY_DEFAULTS.copy()
actual_props.update(sdk_properties)
def initialize(self):
if not self.m.platform.is_mac:
return
self._sdk_version = actual_props['sdk_version'].lower()
self._tool_pkg = actual_props['toolchain_pkg']
self._tool_ver = actual_props['toolchain_ver']
if 'sdk_version' in self._sdk_properties:
self._sdk_version = self._sdk_properties['sdk_version'].lower()
else:
cur_os = self.m.platform.mac_release
for target_os, xcode in reversed(_DEFAULT_VERSION_MAP):
if cur_os >= self.m.version.parse(target_os):
self._sdk_version = xcode
break
else:
self._sdk_version = _DEFAULT_VERSION_MAP[0][-1]
@contextmanager
def __call__(self, kind):
......
recipes/recipe_modules/osx_sdk/examples/full.expected/ancient_version.json 0 → 100644
View file @ f31cb801
[
{
"cmd": [
"cipd",
"ensure",
"-root",
"[CACHE]/osx_sdk",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} git_revision:9a1adc55bf4a1173784da3ba2f8cb06421606748",
"-json-output",
"/path/to/tmp/json"
],
"infra_step": true,
"name": "ensure_installed",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-git_revision:9a1\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/mac_toolchain/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
},
{
"cmd": [
"[CACHE]/osx_sdk/mac_toolchain",
"install",
"-kind",
"mac",
"-xcode-version",
"9c40b",
"-output-dir",
"[CACHE]/osx_sdk/XCode.app"
],
"infra_step": true,
"name": "install xcode"
},
{
"cmd": [
"sudo",
"xcode-select",
"--switch",
"[CACHE]/osx_sdk/XCode.app"
],
"infra_step": true,
"name": "select XCode"
},
{
"cmd": [
"gn",
"gen",
"out/Release"
],
"name": "gn"
},
{
"cmd": [
"ninja",
"-C",
"out/Release"
],
"name": "ninja"
},
{
"cmd": [
"sudo",
"xcode-select",
"--reset"
],
"infra_step": true,
"name": "reset XCode"
},
{
"name": "$result"
}
]
\ No newline at end of file
recipes/recipe_modules/osx_sdk/examples/full.expected/automatic_version.json 0 → 100644
View file @ f31cb801
[
{
"cmd": [
"cipd",
"ensure",
"-root",
"[CACHE]/osx_sdk",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} git_revision:9a1adc55bf4a1173784da3ba2f8cb06421606748",
"-json-output",
"/path/to/tmp/json"
],
"infra_step": true,
"name": "ensure_installed",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-git_revision:9a1\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/mac_toolchain/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
},
{
"cmd": [
"[CACHE]/osx_sdk/mac_toolchain",
"install",
"-kind",
"mac",
"-xcode-version",
"11b52",
"-output-dir",
"[CACHE]/osx_sdk/XCode.app"
],
"infra_step": true,
"name": "install xcode"
},
{
"cmd": [
"sudo",
"xcode-select",
"--switch",
"[CACHE]/osx_sdk/XCode.app"
],
"infra_step": true,
"name": "select XCode"
},
{
"cmd": [
"gn",
"gen",
"out/Release"
],
"name": "gn"
},
{
"cmd": [
"ninja",
"-C",
"out/Release"
],
"name": "ninja"
},
{
"cmd": [
"sudo",
"xcode-select",
"--reset"
],
"infra_step": true,
"name": "reset XCode"
},
{
"name": "$result"
}
]
\ No newline at end of file
recipes/recipe_modules/osx_sdk/examples/full.expected/explicit_version.json 0 → 100644
View file @ f31cb801
[
{
"cmd": [
"cipd",
"ensure",
"-root",
"[CACHE]/osx_sdk",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} git_revision:9a1adc55bf4a1173784da3ba2f8cb06421606748",
"-json-output",
"/path/to/tmp/json"
],
"infra_step": true,
"name": "ensure_installed",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-git_revision:9a1\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/mac_toolchain/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
},
{
"cmd": [
"[CACHE]/osx_sdk/mac_toolchain",
"install",
"-kind",
"mac",
"-xcode-version",
"deadbeef",
"-output-dir",
"[CACHE]/osx_sdk/XCode.app"
],
"infra_step": true,
"name": "install xcode"
},
{
"cmd": [
"sudo",
"xcode-select",
"--switch",
"[CACHE]/osx_sdk/XCode.app"
],
"infra_step": true,
"name": "select XCode"
},
{
"cmd": [
"gn",
"gen",
"out/Release"
],
"name": "gn"
},
{
"cmd": [
"ninja",
"-C",
"out/Release"
],
"name": "ninja"
},
{
"cmd": [
"sudo",
"xcode-select",
"--reset"
],
"infra_step": true,
"name": "reset XCode"
},
{
"name": "$result"
}
]
\ No newline at end of file
recipes/recipe_modules/osx_sdk/examples/full.expected/mac.json
View file @ f31cb801
......@@ -6,7 +6,7 @@
"-root",
"[CACHE]/osx_sdk",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
"infra/tools/mac_toolchain/${platform} git_revision:9a1adc55bf4a1173784da3ba2f8cb06421606748",
"-json-output",
"/path/to/tmp/json"
],
......@@ -17,7 +17,7 @@
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-git_revision:796\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-git_revision:9a1\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/mac_toolchain/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
......@@ -33,7 +33,7 @@
"-kind",
"mac",
"-xcode-version",
"9c40b",
"9f2000",
"-output-dir",
"[CACHE]/osx_sdk/XCode.app"
],
......
recipes/recipe_modules/osx_sdk/examples/full.py
View file @ f31cb801
......@@ -20,3 +20,23 @@ def GenTests(api):
for platform in ('linux', 'mac', 'win'):
yield (api.test(platform) +
api.platform.name(platform))
yield api.test(
'explicit_version',
api.platform.name('mac'),
api.properties(**{'$depot_tools/osx_sdk': {
'sdk_version': 'deadbeef',
}})
)
yield api.test(
'automatic_version',
api.platform.name('mac'),
api.platform.mac_release('10.14.5'),
)
yield api.test(
'ancient_version',
api.platform.name('mac'),
api.platform.mac_release('10.1.0'),
)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment