diff --git a/recipes/recipe_modules/osx_sdk/api.py b/recipes/recipe_modules/osx_sdk/api.py index 3a3821653..abf8d4f5f 100644 --- a/recipes/recipe_modules/osx_sdk/api.py +++ b/recipes/recipe_modules/osx_sdk/api.py @@ -14,8 +14,8 @@ from recipe_engine import recipe_api # TODO(iannucci): replace this with something sane when PROPERTIES is # implemented with a proto message. _PROPERTY_DEFAULTS = { - 'toolchain_pkg': 'infra/tools/mac_toolchain/${platform}', - 'toolchain_ver': 'git_revision:723fc1a6c8cdf2631a57851f5610e598db0c1de1', + 'toolchain_pkg': 'infra/tools/mac_toolchain/${platform}', + 'toolchain_ver': 'git_revision:248bbfc433c8e2fc4e3536d8f58477724ce7110d', } # 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 8cc4536e1..51435769e 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:723fc1a6c8cdf2631a57851f5610e598db0c1de1", + "infra/tools/mac_toolchain/${platform} git_revision:248bbfc433c8e2fc4e3536d8f58477724ce7110d", "-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:723\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-git_revision:248\", @@@", "@@@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 f64e99b9b..8fe7c7d96 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:723fc1a6c8cdf2631a57851f5610e598db0c1de1", + "infra/tools/mac_toolchain/${platform} git_revision:248bbfc433c8e2fc4e3536d8f58477724ce7110d", "-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:723\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-git_revision:248\", @@@", "@@@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 c5541e872..a56010af7 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:723fc1a6c8cdf2631a57851f5610e598db0c1de1", + "infra/tools/mac_toolchain/${platform} git_revision:248bbfc433c8e2fc4e3536d8f58477724ce7110d", "-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:723\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-git_revision:248\", @@@", "@@@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 7b89e2204..bb9c2ad6f 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:723fc1a6c8cdf2631a57851f5610e598db0c1de1", + "infra/tools/mac_toolchain/${platform} git_revision:248bbfc433c8e2fc4e3536d8f58477724ce7110d", "-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:723\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-git_revision:248\", @@@", "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/mac_toolchain/resolved-platform\"@@@", "@@@STEP_LOG_LINE@json.output@ }@@@", "@@@STEP_LOG_LINE@json.output@ ]@@@",