InTheForest/chromium_depot_tools
1
0
Fork 0
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools.git synced 2026-01-11 10:41:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update default mac_toolchain and Xcode versions in osx_sdk recipe module

Browse Source 
Bug: 461757070
Change-Id: I1fdec68d3e80e3fad065a3c67f2f6776568e05c6
Recipe-Nontrivial-Roll: build_internal
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/7171485
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Will Yeager <wyeager@google.com>
This commit is contained in:
Will Yeager
2025-11-19 12:16:13 -08:00
committed by LUCI CQ
parent 14f053740d
commit 778af1e3b8
6 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
recipes/README.recipes.md
View File

@@ -777,11 +777,11 @@ XCode installation.
Available only to Google-run bots.
#### **class [OSXSDKApi](/recipes/recipe_modules/osx_sdk/api.py#45)([RecipeApi][recipe_engine/wkt/RecipeApi]):**
#### **class [OSXSDKApi](/recipes/recipe_modules/osx_sdk/api.py#46)([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#63)(self, kind):**
&emsp; **@contextmanager**<br>&mdash; **def [\_\_call\_\_](/recipes/recipe_modules/osx_sdk/api.py#64)(self, kind):**
Sets up the XCode SDK environment.
@@ -829,7 +829,7 @@ Args:
Raises:
StepFailure or InfraFailure.
&mdash; **def [initialize](/recipes/recipe_modules/osx_sdk/api.py#56)(self):**
&mdash; **def [initialize](/recipes/recipe_modules/osx_sdk/api.py#57)(self):**
### *recipe_modules* / [presubmit](/recipes/recipe_modules/presubmit)
[DEPS](/recipes/recipe_modules/presubmit/__init__.py#12): [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/cv][recipe_engine/recipe_modules/cv], [recipe\_engine/findings][recipe_engine/recipe_modules/findings], [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/raw\_io][recipe_engine/recipe_modules/raw_io], [recipe\_engine/resultdb][recipe_engine/recipe_modules/resultdb], [recipe\_engine/step][recipe_engine/recipe_modules/step]

5
recipes/recipe_modules/osx_sdk/api.py
View File

@@ -15,7 +15,7 @@ from recipe_engine import recipe_api
# implemented with a proto message.
_PROPERTY_DEFAULTS = {
'toolchain_pkg': 'infra/tools/mac_toolchain/${platform}',
'toolchain_ver': 'git_revision:26bb3effce1bc1896a3776c21b84e76ae82c3917',
'toolchain_ver': 'git_revision:4418184743840e63096a58bddda364f4c7555a6f',
}
# Rationalized from https://en.wikipedia.org/wiki/Xcode.
@@ -24,7 +24,7 @@ _PROPERTY_DEFAULTS = {
#
# These correspond to package instance tags for:
#
# https://chrome-infra-packages.appspot.com/p/infra_internal/ios/xcode/xcode_binaries/mac-amd64
# https://chrome-infra-packages.appspot.com/p/infra_internal/ios/xcode/
#
# Keep this sorted by OS version.
_DEFAULT_VERSION_MAP = [
@@ -39,6 +39,7 @@ _DEFAULT_VERSION_MAP = [
('13.5', '15c500b'),
('14.0', '15e204a'),
('15.0', '16c5032a'),
('15.6', '17a400'),
]

4
recipes/recipe_modules/osx_sdk/examples/full.expected/ancient_version.json
View File

@@ -6,7 +6,7 @@
"-root",
"[CACHE]/osx_sdk",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} git_revision:26bb3effce1bc1896a3776c21b84e76ae82c3917",
"infra/tools/mac_toolchain/${platform} git_revision:4418184743840e63096a58bddda364f4c7555a6f",
"-max-threads",
"0",
"-json-output",
@@ -19,7 +19,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:26b\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-git_revision:441\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/mac_toolchain/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",

4
recipes/recipe_modules/osx_sdk/examples/full.expected/automatic_version.json
View File

@@ -6,7 +6,7 @@
"-root",
"[CACHE]/osx_sdk",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} git_revision:26bb3effce1bc1896a3776c21b84e76ae82c3917",
"infra/tools/mac_toolchain/${platform} git_revision:4418184743840e63096a58bddda364f4c7555a6f",
"-max-threads",
"0",
"-json-output",
@@ -19,7 +19,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:26b\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-git_revision:441\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/mac_toolchain/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",

4
recipes/recipe_modules/osx_sdk/examples/full.expected/explicit_version.json
View File

@@ -6,7 +6,7 @@
"-root",
"[CACHE]/osx_sdk",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} git_revision:26bb3effce1bc1896a3776c21b84e76ae82c3917",
"infra/tools/mac_toolchain/${platform} git_revision:4418184743840e63096a58bddda364f4c7555a6f",
"-max-threads",
"0",
"-json-output",
@@ -19,7 +19,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:26b\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-git_revision:441\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/mac_toolchain/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",

4
recipes/recipe_modules/osx_sdk/examples/full.expected/mac.json
View File

@@ -6,7 +6,7 @@
"-root",
"[CACHE]/osx_sdk",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} git_revision:26bb3effce1bc1896a3776c21b84e76ae82c3917",
"infra/tools/mac_toolchain/${platform} git_revision:4418184743840e63096a58bddda364f4c7555a6f",
"-max-threads",
"0",
"-json-output",
@@ -19,7 +19,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:26b\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-git_revision:441\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/mac_toolchain/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",