aiden
/
depot_tools
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Roll mac_toolchain version for builders using osx_sdk

Browse Source 
This would add support for uploading/installing Xcode with MacOS13 adoption

Recipe-Nontrivial-Roll: build_limited
Bug: 1441931
Change-Id: I7496a80a6876fc4b0df712ce1634611f59240e67
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4566408
Reviewed-by: Garrett Beaty <gbeaty@google.com>
Reviewed-by: Jeff Yoon <jeffyoon@google.com>
Commit-Queue: Yue She <yueshe@google.com>
changes/08/4566408/5
Yue She 2 years ago committed by LUCI CQ
parent 43ceaf0353
commit c83abb3247
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File

2
recipes/recipe_modules/osx_sdk/api.py
Unescape Escape View File

@ -15,7 +15,7 @@ from recipe_engine import recipe_api
# implemented with a proto message. # implemented with a proto message.
_PROPERTY_DEFAULTS = { _PROPERTY_DEFAULTS = {
'toolchain_pkg': 'infra/tools/mac_toolchain/${platform}', 'toolchain_pkg': 'infra/tools/mac_toolchain/${platform}',
'toolchain_ver': 'git_revision:248bbfc433c8e2fc4e3536d8f58477724ce7110d', 'toolchain_ver': 'git_revision:3e597065cb23c1fe03aeb2ebd792d83e0709c5c2',
} }
# Rationalized from https://en.wikipedia.org/wiki/Xcode. # Rationalized from https://en.wikipedia.org/wiki/Xcode.

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

@ -6,7 +6,7 @@
"-root", "-root",
"[CACHE]/osx_sdk", "[CACHE]/osx_sdk",
"-ensure-file", "-ensure-file",
"infra/tools/mac_toolchain/${platform} git_revision:248bbfc433c8e2fc4e3536d8f58477724ce7110d", "infra/tools/mac_toolchain/${platform} git_revision:3e597065cb23c1fe03aeb2ebd792d83e0709c5c2",
"-max-threads", "-max-threads",
"0", "0",
"-json-output", "-json-output",
@ -19,7 +19,7 @@
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@", "@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@", "@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-git_revision:248\", @@@", "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-git_revision:3e5\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/mac_toolchain/resolved-platform\"@@@", "@@@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@ ]@@@",

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

@ -6,7 +6,7 @@
"-root", "-root",
"[CACHE]/osx_sdk", "[CACHE]/osx_sdk",
"-ensure-file", "-ensure-file",
"infra/tools/mac_toolchain/${platform} git_revision:248bbfc433c8e2fc4e3536d8f58477724ce7110d", "infra/tools/mac_toolchain/${platform} git_revision:3e597065cb23c1fe03aeb2ebd792d83e0709c5c2",
"-max-threads", "-max-threads",
"0", "0",
"-json-output", "-json-output",
@ -19,7 +19,7 @@
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@", "@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@", "@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-git_revision:248\", @@@", "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-git_revision:3e5\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/mac_toolchain/resolved-platform\"@@@", "@@@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@ ]@@@",

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

@ -6,7 +6,7 @@
"-root", "-root",
"[CACHE]/osx_sdk", "[CACHE]/osx_sdk",
"-ensure-file", "-ensure-file",
"infra/tools/mac_toolchain/${platform} git_revision:248bbfc433c8e2fc4e3536d8f58477724ce7110d", "infra/tools/mac_toolchain/${platform} git_revision:3e597065cb23c1fe03aeb2ebd792d83e0709c5c2",
"-max-threads", "-max-threads",
"0", "0",
"-json-output", "-json-output",
@ -19,7 +19,7 @@
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@", "@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@", "@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-git_revision:248\", @@@", "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-git_revision:3e5\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/mac_toolchain/resolved-platform\"@@@", "@@@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@ ]@@@",

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

@ -6,7 +6,7 @@
"-root", "-root",
"[CACHE]/osx_sdk", "[CACHE]/osx_sdk",
"-ensure-file", "-ensure-file",
"infra/tools/mac_toolchain/${platform} git_revision:248bbfc433c8e2fc4e3536d8f58477724ce7110d", "infra/tools/mac_toolchain/${platform} git_revision:3e597065cb23c1fe03aeb2ebd792d83e0709c5c2",
"-max-threads", "-max-threads",
"0", "0",
"-json-output", "-json-output",
@ -19,7 +19,7 @@
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@", "@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@", "@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-git_revision:248\", @@@", "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-git_revision:3e5\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/mac_toolchain/resolved-platform\"@@@", "@@@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@ ]@@@",

Write Preview
Loading…
Cancel
Save