Commit d1580d53 authored by Jeff Yoon's avatar Jeff Yoon Committed by LUCI CQ

Add xcode version for Mac OS 10.15.4 in osx_sdk

Adding a version map entry for 10.15.6 to default to XCode 12
GM (12a7209) as machines upgrade to 10.15.

Bug: 1128042, 1128044
Change-Id: I6396b67fdce006d19be35d972602bac3bd4ae0a7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2422449Reviewed-by: 's avatarDirk Pranke <dpranke@google.com>
Commit-Queue: Jeff Yoon <jeffyoon@chromium.org>
parent 407b5a54
...@@ -688,11 +688,11 @@ XCode installation. ...@@ -688,11 +688,11 @@ XCode installation.
Available only to Google-run bots. Available only to Google-run bots.
#### **class [OSXSDKApi](/recipes/recipe_modules/osx_sdk/api.py#35)([RecipeApi][recipe_engine/wkt/RecipeApi]):** #### **class [OSXSDKApi](/recipes/recipe_modules/osx_sdk/api.py#36)([RecipeApi][recipe_engine/wkt/RecipeApi]):**
API for using OS X SDK distributed via CIPD. API for using OS X SDK distributed via CIPD.
&emsp; **@contextmanager**<br>&mdash; **def [\_\_call\_\_](/recipes/recipe_modules/osx_sdk/api.py#61)(self, kind):** &emsp; **@contextmanager**<br>&mdash; **def [\_\_call\_\_](/recipes/recipe_modules/osx_sdk/api.py#62)(self, kind):**
Sets up the XCode SDK environment. Sets up the XCode SDK environment.
...@@ -740,7 +740,7 @@ Args: ...@@ -740,7 +740,7 @@ Args:
Raises: Raises:
StepFailure or InfraFailure. StepFailure or InfraFailure.
&mdash; **def [initialize](/recipes/recipe_modules/osx_sdk/api.py#46)(self):** &mdash; **def [initialize](/recipes/recipe_modules/osx_sdk/api.py#47)(self):**
### *recipe_modules* / [presubmit](/recipes/recipe_modules/presubmit) ### *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/resultdb][recipe_engine/recipe_modules/resultdb], [recipe\_engine/step][recipe_engine/recipe_modules/step] [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/resultdb][recipe_engine/recipe_modules/resultdb], [recipe\_engine/step][recipe_engine/recipe_modules/step]
......
...@@ -29,6 +29,7 @@ _DEFAULT_VERSION_MAP = [ ...@@ -29,6 +29,7 @@ _DEFAULT_VERSION_MAP = [
('10.13.6', '10b61'), ('10.13.6', '10b61'),
('10.14.3', '10g8'), ('10.14.3', '10g8'),
('10.14.4', '11b52'), ('10.14.4', '11b52'),
('10.15.4', '12a7209')
] ]
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
"-kind", "-kind",
"mac", "mac",
"-xcode-version", "-xcode-version",
"11b52", "12a7209",
"-output-dir", "-output-dir",
"[CACHE]/osx_sdk/XCode.app" "[CACHE]/osx_sdk/XCode.app"
], ],
......
...@@ -32,7 +32,7 @@ def GenTests(api): ...@@ -32,7 +32,7 @@ def GenTests(api):
yield api.test( yield api.test(
'automatic_version', 'automatic_version',
api.platform.name('mac'), api.platform.name('mac'),
api.platform.mac_release('10.14.5'), api.platform.mac_release('10.15.6'),
) )
yield api.test( yield api.test(
......
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