From c83abb3247532d8e80d7ec7e8478a924b73d58c6 Mon Sep 17 00:00:00 2001 From: Yue She Date: Thu, 25 May 2023 18:40:39 +0000 Subject: [PATCH] Roll mac_toolchain version for builders using osx_sdk 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 Reviewed-by: Jeff Yoon Commit-Queue: Yue She --- recipes/recipe_modules/osx_sdk/api.py | 2 +- .../osx_sdk/examples/full.expected/ancient_version.json | 4 ++-- .../osx_sdk/examples/full.expected/automatic_version.json | 4 ++-- .../osx_sdk/examples/full.expected/explicit_version.json | 4 ++-- .../recipe_modules/osx_sdk/examples/full.expected/mac.json | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/recipes/recipe_modules/osx_sdk/api.py b/recipes/recipe_modules/osx_sdk/api.py index abf8d4f5f..5de0c78bb 100644 --- a/recipes/recipe_modules/osx_sdk/api.py +++ b/recipes/recipe_modules/osx_sdk/api.py @@ -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:248bbfc433c8e2fc4e3536d8f58477724ce7110d', + 'toolchain_ver': 'git_revision:3e597065cb23c1fe03aeb2ebd792d83e0709c5c2', } # Rationalized from https://en.wikipedia.org/wiki/Xcode. diff --git a/recipes/recipe_modules/osx_sdk/examples/full.expected/ancient_version.json b/recipes/recipe_modules/osx_sdk/examples/full.expected/ancient_version.json index 51435769e..71fc211fd 100644 --- a/recipes/recipe_modules/osx_sdk/examples/full.expected/ancient_version.json +++ b/recipes/recipe_modules/osx_sdk/examples/full.expected/ancient_version.json @@ -6,7 +6,7 @@ "-root", "[CACHE]/osx_sdk", "-ensure-file", - "infra/tools/mac_toolchain/${platform} git_revision:248bbfc433c8e2fc4e3536d8f58477724ce7110d", + "infra/tools/mac_toolchain/${platform} git_revision:3e597065cb23c1fe03aeb2ebd792d83e0709c5c2", "-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: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@ }@@@", "@@@STEP_LOG_LINE@json.output@ ]@@@", diff --git a/recipes/recipe_modules/osx_sdk/examples/full.expected/automatic_version.json b/recipes/recipe_modules/osx_sdk/examples/full.expected/automatic_version.json index 8fe7c7d96..a76acfbc3 100644 --- a/recipes/recipe_modules/osx_sdk/examples/full.expected/automatic_version.json +++ b/recipes/recipe_modules/osx_sdk/examples/full.expected/automatic_version.json @@ -6,7 +6,7 @@ "-root", "[CACHE]/osx_sdk", "-ensure-file", - "infra/tools/mac_toolchain/${platform} git_revision:248bbfc433c8e2fc4e3536d8f58477724ce7110d", + "infra/tools/mac_toolchain/${platform} git_revision:3e597065cb23c1fe03aeb2ebd792d83e0709c5c2", "-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: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@ }@@@", "@@@STEP_LOG_LINE@json.output@ ]@@@", diff --git a/recipes/recipe_modules/osx_sdk/examples/full.expected/explicit_version.json b/recipes/recipe_modules/osx_sdk/examples/full.expected/explicit_version.json index a56010af7..e7d0e082f 100644 --- a/recipes/recipe_modules/osx_sdk/examples/full.expected/explicit_version.json +++ b/recipes/recipe_modules/osx_sdk/examples/full.expected/explicit_version.json @@ -6,7 +6,7 @@ "-root", "[CACHE]/osx_sdk", "-ensure-file", - "infra/tools/mac_toolchain/${platform} git_revision:248bbfc433c8e2fc4e3536d8f58477724ce7110d", + "infra/tools/mac_toolchain/${platform} git_revision:3e597065cb23c1fe03aeb2ebd792d83e0709c5c2", "-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: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@ }@@@", "@@@STEP_LOG_LINE@json.output@ ]@@@", diff --git a/recipes/recipe_modules/osx_sdk/examples/full.expected/mac.json b/recipes/recipe_modules/osx_sdk/examples/full.expected/mac.json index bb9c2ad6f..3431fa42e 100644 --- a/recipes/recipe_modules/osx_sdk/examples/full.expected/mac.json +++ b/recipes/recipe_modules/osx_sdk/examples/full.expected/mac.json @@ -6,7 +6,7 @@ "-root", "[CACHE]/osx_sdk", "-ensure-file", - "infra/tools/mac_toolchain/${platform} git_revision:248bbfc433c8e2fc4e3536d8f58477724ce7110d", + "infra/tools/mac_toolchain/${platform} git_revision:3e597065cb23c1fe03aeb2ebd792d83e0709c5c2", "-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: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@ }@@@", "@@@STEP_LOG_LINE@json.output@ ]@@@",