Browse Source

Add the latest Xcode versions for macOS 13.0, 13.5 and 14.0

According to https://en.wikipedia.org/wiki/Xcode:
- macOS 13.0 is the minimum macOS version supported by
  14E222b and 14E300c
  - So we point 13.0 to the latest one, which is 14E300c
- macOS 13.5 is the minimum macOS version supported by
  15A240d, 15A507, 15C65, and 15C500b
  - So we point it to the latest one, which is 15C500b
- macOS 14.0 is the minimum macOS version supported by
  15E5204a (which looks like a typo of 15e204a according
  to xcodereleases.com and //infra/config/targets/mixins.star)
  - There will surely be more versions that support back
    to 14.0 but this is the only one for now. So we point
    it 15e204a.

This should hopefully give us C++20 support on macOS 13 and up,
like we see in the Chromium waterfall.

Bug: chromium: 40284755
Change-Id: I2049aa3c4b32990dbedbd95e9ec35cceaa1ca3a3
Recipe-Nontrivial-Roll: infra
Recipe-Nontrivial-Roll: build_limited
Recipe-Nontrivial-Roll: build
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/5425635
Reviewed-by: Gavin Mak <gavinmak@google.com>
Commit-Queue: danakj <danakj@chromium.org>
danakj 1 year ago
parent
commit
7fa774456f

+ 3 - 3
recipes/README.recipes.md

@@ -729,11 +729,11 @@ XCode installation.
 
 Available only to Google-run bots.
 
-#### **class [OSXSDKApi](/recipes/recipe_modules/osx_sdk/api.py#39)([RecipeApi][recipe_engine/wkt/RecipeApi]):**
+#### **class [OSXSDKApi](/recipes/recipe_modules/osx_sdk/api.py#40)([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#57)(self, kind):**
+&emsp; **@contextmanager**<br>&mdash; **def [\_\_call\_\_](/recipes/recipe_modules/osx_sdk/api.py#58)(self, kind):**
 
 Sets up the XCode SDK environment.
 
@@ -781,7 +781,7 @@ Args:
 Raises:
     StepFailure or InfraFailure.
 
-&mdash; **def [initialize](/recipes/recipe_modules/osx_sdk/api.py#50)(self):**
+&mdash; **def [initialize](/recipes/recipe_modules/osx_sdk/api.py#51)(self):**
 ### *recipe_modules* / [presubmit](/recipes/recipe_modules/presubmit)
 
 [DEPS](/recipes/recipe_modules/presubmit/__init__.py#13): [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/buildbucket][recipe_engine/recipe_modules/buildbucket], [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/resultdb][recipe_engine/recipe_modules/resultdb], [recipe\_engine/step][recipe_engine/recipe_modules/step]

+ 3 - 2
recipes/recipe_modules/osx_sdk/api.py

@@ -31,8 +31,9 @@ _DEFAULT_VERSION_MAP = [
     ('10.14.4', '11b52'),
     ('10.15.4', '12d4e'),
     ('11.3', '13c100'),
-    ('13.3', '14c18'),
-    ('14.2', '15c500b'),
+    ('13.0', '14e300c'),
+    ('13.5', '15c500b'),
+    ('14.0', '15e204a'),
 ]
 
 

+ 1 - 1
recipes/recipe_modules/osx_sdk/examples/full.expected/mac.json

@@ -46,7 +46,7 @@
       "-kind",
       "mac",
       "-xcode-version",
-      "15c500b",
+      "15e204a",
       "-output-dir",
       "[CACHE]/osx_sdk/XCode.app"
     ],