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

[mac_toolchain] roll mac_toolchain version on osx_sdk recipe module

Browse Source 
This includes:
- https://crrev.com/c/7224890 Retry adding runtimes after duplicate
- https://crrev.com/c/7225999 Get rid of log spam from running gktool

Bug:462643928
Change-Id: Id9e1d8f41843b9a67fe8004070c31eff263efefb
Recipe-Nontrivial-Roll: infra
Recipe-Nontrivial-Roll: build_internal
Recipe-Nontrivial-Roll: build
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/7226355
Reviewed-by: Yue She <yueshe@google.com>
Commit-Queue: Will Yeager <wyeager@google.com>
This commit is contained in:
Will Yeager
2025-12-04 09:15:11 -08:00
committed by LUCI CQ
parent 85116f1710
commit 413ad24ec4
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
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:4418184743840e63096a58bddda364f4c7555a6f',
'toolchain_ver': 'git_revision:b0c0a706097c27444dbe3f84e5553f1aaa77c1a6',
}
# Rationalized from https://en.wikipedia.org/wiki/Xcode.

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:4418184743840e63096a58bddda364f4c7555a6f",
"infra/tools/mac_toolchain/${platform} git_revision:b0c0a706097c27444dbe3f84e5553f1aaa77c1a6",
"-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:441\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-git_revision:b0c\",@@@",
"@@@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:4418184743840e63096a58bddda364f4c7555a6f",
"infra/tools/mac_toolchain/${platform} git_revision:b0c0a706097c27444dbe3f84e5553f1aaa77c1a6",
"-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:441\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-git_revision:b0c\",@@@",
"@@@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:4418184743840e63096a58bddda364f4c7555a6f",
"infra/tools/mac_toolchain/${platform} git_revision:b0c0a706097c27444dbe3f84e5553f1aaa77c1a6",
"-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:441\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-git_revision:b0c\",@@@",
"@@@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:4418184743840e63096a58bddda364f4c7555a6f",
"infra/tools/mac_toolchain/${platform} git_revision:b0c0a706097c27444dbe3f84e5553f1aaa77c1a6",
"-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:441\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-git_revision:b0c\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/mac_toolchain/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",