remove SetupMacOSSDK
Bug: https://github.com/flutter/flutter/issues/66592
Change-Id: Ib176f4506a54c3f47df6110c674fcbb5f459b593
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/6761
Reviewed-by: Keyong Han <keyonghan@google.com>
Commit-Queue: Christopher Fujino <fujino@google.com>
diff --git a/recipes/engine_1_22_0.expected/mac.json b/recipes/engine_1_22_0.expected/mac.json
index ac315d9..a8ea9ec 100644
--- a/recipes/engine_1_22_0.expected/mac.json
+++ b/recipes/engine_1_22_0.expected/mac.json
@@ -6165,52 +6165,6 @@
},
{
"cmd": [
- "cipd",
- "ensure",
- "-root",
- "[CACHE]/xcode_binary",
- "-ensure-file",
- "infra_internal/ios/xcode/xcode_binaries/${platform} yjQtk3auAegQO4t18uBtBlKbj76xBjVtLE-3UM2faRUC",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "cwd": "[CACHE]/builder",
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "GOMA_DIR": "[CACHE]/goma/client"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "name": "ensure_installed (3)",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@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-yjQtk3auAegQO4t1\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/ios/xcode/xcode_binaries/resolved-platform\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
"gem",
"install",
"jazzy:0.8.4",
@@ -6220,8 +6174,7 @@
"cwd": "[START_DIR]/gems",
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "GOMA_DIR": "[CACHE]/goma/client",
- "SDKROOT": "[CACHE]/xcode_binary/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk"
+ "GOMA_DIR": "[CACHE]/goma/client"
},
"env_prefixes": {
"PATH": [
diff --git a/recipes/engine_1_22_0.expected/mac_maven_or_bitcode.json b/recipes/engine_1_22_0.expected/mac_maven_or_bitcode.json
index f266933..49e2eb3 100644
--- a/recipes/engine_1_22_0.expected/mac_maven_or_bitcode.json
+++ b/recipes/engine_1_22_0.expected/mac_maven_or_bitcode.json
@@ -6165,52 +6165,6 @@
},
{
"cmd": [
- "cipd",
- "ensure",
- "-root",
- "[CACHE]/xcode_binary",
- "-ensure-file",
- "infra_internal/ios/xcode/xcode_binaries/${platform} yjQtk3auAegQO4t18uBtBlKbj76xBjVtLE-3UM2faRUC",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "cwd": "[CACHE]/builder",
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "GOMA_DIR": "[CACHE]/goma/client"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "name": "ensure_installed (3)",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@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-yjQtk3auAegQO4t1\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/ios/xcode/xcode_binaries/resolved-platform\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
"gem",
"install",
"jazzy:0.8.4",
@@ -6220,8 +6174,7 @@
"cwd": "[START_DIR]/gems",
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "GOMA_DIR": "[CACHE]/goma/client",
- "SDKROOT": "[CACHE]/xcode_binary/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk"
+ "GOMA_DIR": "[CACHE]/goma/client"
},
"env_prefixes": {
"PATH": [
diff --git a/recipes/engine_1_22_0.expected/mac_maven_or_bitcode_no_lto.json b/recipes/engine_1_22_0.expected/mac_maven_or_bitcode_no_lto.json
index 0532e63..496e83f 100644
--- a/recipes/engine_1_22_0.expected/mac_maven_or_bitcode_no_lto.json
+++ b/recipes/engine_1_22_0.expected/mac_maven_or_bitcode_no_lto.json
@@ -6172,52 +6172,6 @@
},
{
"cmd": [
- "cipd",
- "ensure",
- "-root",
- "[CACHE]/xcode_binary",
- "-ensure-file",
- "infra_internal/ios/xcode/xcode_binaries/${platform} yjQtk3auAegQO4t18uBtBlKbj76xBjVtLE-3UM2faRUC",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "cwd": "[CACHE]/builder",
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "GOMA_DIR": "[CACHE]/goma/client"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "name": "ensure_installed (3)",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@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-yjQtk3auAegQO4t1\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/ios/xcode/xcode_binaries/resolved-platform\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
"gem",
"install",
"jazzy:0.8.4",
@@ -6227,8 +6181,7 @@
"cwd": "[START_DIR]/gems",
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "GOMA_DIR": "[CACHE]/goma/client",
- "SDKROOT": "[CACHE]/xcode_binary/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk"
+ "GOMA_DIR": "[CACHE]/goma/client"
},
"env_prefixes": {
"PATH": [
diff --git a/recipes/engine_1_22_0.expected/mac_maven_or_bitcode_publish_cipd.json b/recipes/engine_1_22_0.expected/mac_maven_or_bitcode_publish_cipd.json
index f266933..49e2eb3 100644
--- a/recipes/engine_1_22_0.expected/mac_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine_1_22_0.expected/mac_maven_or_bitcode_publish_cipd.json
@@ -6165,52 +6165,6 @@
},
{
"cmd": [
- "cipd",
- "ensure",
- "-root",
- "[CACHE]/xcode_binary",
- "-ensure-file",
- "infra_internal/ios/xcode/xcode_binaries/${platform} yjQtk3auAegQO4t18uBtBlKbj76xBjVtLE-3UM2faRUC",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "cwd": "[CACHE]/builder",
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "GOMA_DIR": "[CACHE]/goma/client"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "name": "ensure_installed (3)",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@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-yjQtk3auAegQO4t1\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/ios/xcode/xcode_binaries/resolved-platform\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
"gem",
"install",
"jazzy:0.8.4",
@@ -6220,8 +6174,7 @@
"cwd": "[START_DIR]/gems",
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "GOMA_DIR": "[CACHE]/goma/client",
- "SDKROOT": "[CACHE]/xcode_binary/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk"
+ "GOMA_DIR": "[CACHE]/goma/client"
},
"env_prefixes": {
"PATH": [
diff --git a/recipes/engine_1_22_0.expected/mac_maven_or_bitcode_publish_cipd_no_lto.json b/recipes/engine_1_22_0.expected/mac_maven_or_bitcode_publish_cipd_no_lto.json
index 0532e63..496e83f 100644
--- a/recipes/engine_1_22_0.expected/mac_maven_or_bitcode_publish_cipd_no_lto.json
+++ b/recipes/engine_1_22_0.expected/mac_maven_or_bitcode_publish_cipd_no_lto.json
@@ -6172,52 +6172,6 @@
},
{
"cmd": [
- "cipd",
- "ensure",
- "-root",
- "[CACHE]/xcode_binary",
- "-ensure-file",
- "infra_internal/ios/xcode/xcode_binaries/${platform} yjQtk3auAegQO4t18uBtBlKbj76xBjVtLE-3UM2faRUC",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "cwd": "[CACHE]/builder",
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "GOMA_DIR": "[CACHE]/goma/client"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "name": "ensure_installed (3)",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@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-yjQtk3auAegQO4t1\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/ios/xcode/xcode_binaries/resolved-platform\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
"gem",
"install",
"jazzy:0.8.4",
@@ -6227,8 +6181,7 @@
"cwd": "[START_DIR]/gems",
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "GOMA_DIR": "[CACHE]/goma/client",
- "SDKROOT": "[CACHE]/xcode_binary/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk"
+ "GOMA_DIR": "[CACHE]/goma/client"
},
"env_prefixes": {
"PATH": [
diff --git a/recipes/engine_1_22_0.expected/mac_no_lto.json b/recipes/engine_1_22_0.expected/mac_no_lto.json
index ccee28f..9a876e0 100644
--- a/recipes/engine_1_22_0.expected/mac_no_lto.json
+++ b/recipes/engine_1_22_0.expected/mac_no_lto.json
@@ -6172,52 +6172,6 @@
},
{
"cmd": [
- "cipd",
- "ensure",
- "-root",
- "[CACHE]/xcode_binary",
- "-ensure-file",
- "infra_internal/ios/xcode/xcode_binaries/${platform} yjQtk3auAegQO4t18uBtBlKbj76xBjVtLE-3UM2faRUC",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "cwd": "[CACHE]/builder",
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "GOMA_DIR": "[CACHE]/goma/client"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "name": "ensure_installed (3)",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@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-yjQtk3auAegQO4t1\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/ios/xcode/xcode_binaries/resolved-platform\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
"gem",
"install",
"jazzy:0.8.4",
@@ -6227,8 +6181,7 @@
"cwd": "[START_DIR]/gems",
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "GOMA_DIR": "[CACHE]/goma/client",
- "SDKROOT": "[CACHE]/xcode_binary/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk"
+ "GOMA_DIR": "[CACHE]/goma/client"
},
"env_prefixes": {
"PATH": [
diff --git a/recipes/engine_1_22_0.expected/mac_publish_cipd.json b/recipes/engine_1_22_0.expected/mac_publish_cipd.json
index ac315d9..a8ea9ec 100644
--- a/recipes/engine_1_22_0.expected/mac_publish_cipd.json
+++ b/recipes/engine_1_22_0.expected/mac_publish_cipd.json
@@ -6165,52 +6165,6 @@
},
{
"cmd": [
- "cipd",
- "ensure",
- "-root",
- "[CACHE]/xcode_binary",
- "-ensure-file",
- "infra_internal/ios/xcode/xcode_binaries/${platform} yjQtk3auAegQO4t18uBtBlKbj76xBjVtLE-3UM2faRUC",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "cwd": "[CACHE]/builder",
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "GOMA_DIR": "[CACHE]/goma/client"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "name": "ensure_installed (3)",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@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-yjQtk3auAegQO4t1\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/ios/xcode/xcode_binaries/resolved-platform\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
"gem",
"install",
"jazzy:0.8.4",
@@ -6220,8 +6174,7 @@
"cwd": "[START_DIR]/gems",
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "GOMA_DIR": "[CACHE]/goma/client",
- "SDKROOT": "[CACHE]/xcode_binary/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk"
+ "GOMA_DIR": "[CACHE]/goma/client"
},
"env_prefixes": {
"PATH": [
diff --git a/recipes/engine_1_22_0.expected/mac_publish_cipd_no_lto.json b/recipes/engine_1_22_0.expected/mac_publish_cipd_no_lto.json
index ccee28f..9a876e0 100644
--- a/recipes/engine_1_22_0.expected/mac_publish_cipd_no_lto.json
+++ b/recipes/engine_1_22_0.expected/mac_publish_cipd_no_lto.json
@@ -6172,52 +6172,6 @@
},
{
"cmd": [
- "cipd",
- "ensure",
- "-root",
- "[CACHE]/xcode_binary",
- "-ensure-file",
- "infra_internal/ios/xcode/xcode_binaries/${platform} yjQtk3auAegQO4t18uBtBlKbj76xBjVtLE-3UM2faRUC",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "cwd": "[CACHE]/builder",
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "GOMA_DIR": "[CACHE]/goma/client"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "name": "ensure_installed (3)",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@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-yjQtk3auAegQO4t1\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/ios/xcode/xcode_binaries/resolved-platform\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
"gem",
"install",
"jazzy:0.8.4",
@@ -6227,8 +6181,7 @@
"cwd": "[START_DIR]/gems",
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "GOMA_DIR": "[CACHE]/goma/client",
- "SDKROOT": "[CACHE]/xcode_binary/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk"
+ "GOMA_DIR": "[CACHE]/goma/client"
},
"env_prefixes": {
"PATH": [
diff --git a/recipes/engine_1_22_0.expected/mac_upload.json b/recipes/engine_1_22_0.expected/mac_upload.json
index 3214f72..3214eea 100644
--- a/recipes/engine_1_22_0.expected/mac_upload.json
+++ b/recipes/engine_1_22_0.expected/mac_upload.json
@@ -6777,52 +6777,6 @@
},
{
"cmd": [
- "cipd",
- "ensure",
- "-root",
- "[CACHE]/xcode_binary",
- "-ensure-file",
- "infra_internal/ios/xcode/xcode_binaries/${platform} yjQtk3auAegQO4t18uBtBlKbj76xBjVtLE-3UM2faRUC",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "cwd": "[CACHE]/builder",
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "GOMA_DIR": "[CACHE]/goma/client"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "name": "ensure_installed (3)",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@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-yjQtk3auAegQO4t1\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/ios/xcode/xcode_binaries/resolved-platform\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
"gem",
"install",
"jazzy:0.8.4",
@@ -6832,8 +6786,7 @@
"cwd": "[START_DIR]/gems",
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "GOMA_DIR": "[CACHE]/goma/client",
- "SDKROOT": "[CACHE]/xcode_binary/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk"
+ "GOMA_DIR": "[CACHE]/goma/client"
},
"env_prefixes": {
"PATH": [
diff --git a/recipes/engine_1_22_0.expected/mac_upload_maven_or_bitcode.json b/recipes/engine_1_22_0.expected/mac_upload_maven_or_bitcode.json
index ee1377c..3707dc7 100644
--- a/recipes/engine_1_22_0.expected/mac_upload_maven_or_bitcode.json
+++ b/recipes/engine_1_22_0.expected/mac_upload_maven_or_bitcode.json
@@ -6777,52 +6777,6 @@
},
{
"cmd": [
- "cipd",
- "ensure",
- "-root",
- "[CACHE]/xcode_binary",
- "-ensure-file",
- "infra_internal/ios/xcode/xcode_binaries/${platform} yjQtk3auAegQO4t18uBtBlKbj76xBjVtLE-3UM2faRUC",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "cwd": "[CACHE]/builder",
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "GOMA_DIR": "[CACHE]/goma/client"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "name": "ensure_installed (3)",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@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-yjQtk3auAegQO4t1\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/ios/xcode/xcode_binaries/resolved-platform\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
"gem",
"install",
"jazzy:0.8.4",
@@ -6832,8 +6786,7 @@
"cwd": "[START_DIR]/gems",
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "GOMA_DIR": "[CACHE]/goma/client",
- "SDKROOT": "[CACHE]/xcode_binary/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk"
+ "GOMA_DIR": "[CACHE]/goma/client"
},
"env_prefixes": {
"PATH": [
diff --git a/recipes/engine_1_22_0.expected/mac_upload_maven_or_bitcode_no_lto.json b/recipes/engine_1_22_0.expected/mac_upload_maven_or_bitcode_no_lto.json
index 3085d51..a167038 100644
--- a/recipes/engine_1_22_0.expected/mac_upload_maven_or_bitcode_no_lto.json
+++ b/recipes/engine_1_22_0.expected/mac_upload_maven_or_bitcode_no_lto.json
@@ -6784,52 +6784,6 @@
},
{
"cmd": [
- "cipd",
- "ensure",
- "-root",
- "[CACHE]/xcode_binary",
- "-ensure-file",
- "infra_internal/ios/xcode/xcode_binaries/${platform} yjQtk3auAegQO4t18uBtBlKbj76xBjVtLE-3UM2faRUC",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "cwd": "[CACHE]/builder",
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "GOMA_DIR": "[CACHE]/goma/client"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "name": "ensure_installed (3)",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@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-yjQtk3auAegQO4t1\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/ios/xcode/xcode_binaries/resolved-platform\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
"gem",
"install",
"jazzy:0.8.4",
@@ -6839,8 +6793,7 @@
"cwd": "[START_DIR]/gems",
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "GOMA_DIR": "[CACHE]/goma/client",
- "SDKROOT": "[CACHE]/xcode_binary/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk"
+ "GOMA_DIR": "[CACHE]/goma/client"
},
"env_prefixes": {
"PATH": [
diff --git a/recipes/engine_1_22_0.expected/mac_upload_maven_or_bitcode_publish_cipd.json b/recipes/engine_1_22_0.expected/mac_upload_maven_or_bitcode_publish_cipd.json
index ee1377c..3707dc7 100644
--- a/recipes/engine_1_22_0.expected/mac_upload_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine_1_22_0.expected/mac_upload_maven_or_bitcode_publish_cipd.json
@@ -6777,52 +6777,6 @@
},
{
"cmd": [
- "cipd",
- "ensure",
- "-root",
- "[CACHE]/xcode_binary",
- "-ensure-file",
- "infra_internal/ios/xcode/xcode_binaries/${platform} yjQtk3auAegQO4t18uBtBlKbj76xBjVtLE-3UM2faRUC",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "cwd": "[CACHE]/builder",
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "GOMA_DIR": "[CACHE]/goma/client"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "name": "ensure_installed (3)",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@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-yjQtk3auAegQO4t1\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/ios/xcode/xcode_binaries/resolved-platform\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
"gem",
"install",
"jazzy:0.8.4",
@@ -6832,8 +6786,7 @@
"cwd": "[START_DIR]/gems",
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "GOMA_DIR": "[CACHE]/goma/client",
- "SDKROOT": "[CACHE]/xcode_binary/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk"
+ "GOMA_DIR": "[CACHE]/goma/client"
},
"env_prefixes": {
"PATH": [
diff --git a/recipes/engine_1_22_0.expected/mac_upload_maven_or_bitcode_publish_cipd_no_lto.json b/recipes/engine_1_22_0.expected/mac_upload_maven_or_bitcode_publish_cipd_no_lto.json
index 3085d51..a167038 100644
--- a/recipes/engine_1_22_0.expected/mac_upload_maven_or_bitcode_publish_cipd_no_lto.json
+++ b/recipes/engine_1_22_0.expected/mac_upload_maven_or_bitcode_publish_cipd_no_lto.json
@@ -6784,52 +6784,6 @@
},
{
"cmd": [
- "cipd",
- "ensure",
- "-root",
- "[CACHE]/xcode_binary",
- "-ensure-file",
- "infra_internal/ios/xcode/xcode_binaries/${platform} yjQtk3auAegQO4t18uBtBlKbj76xBjVtLE-3UM2faRUC",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "cwd": "[CACHE]/builder",
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "GOMA_DIR": "[CACHE]/goma/client"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "name": "ensure_installed (3)",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@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-yjQtk3auAegQO4t1\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/ios/xcode/xcode_binaries/resolved-platform\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
"gem",
"install",
"jazzy:0.8.4",
@@ -6839,8 +6793,7 @@
"cwd": "[START_DIR]/gems",
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "GOMA_DIR": "[CACHE]/goma/client",
- "SDKROOT": "[CACHE]/xcode_binary/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk"
+ "GOMA_DIR": "[CACHE]/goma/client"
},
"env_prefixes": {
"PATH": [
diff --git a/recipes/engine_1_22_0.expected/mac_upload_no_lto.json b/recipes/engine_1_22_0.expected/mac_upload_no_lto.json
index b216db8..ebcd87e 100644
--- a/recipes/engine_1_22_0.expected/mac_upload_no_lto.json
+++ b/recipes/engine_1_22_0.expected/mac_upload_no_lto.json
@@ -6784,52 +6784,6 @@
},
{
"cmd": [
- "cipd",
- "ensure",
- "-root",
- "[CACHE]/xcode_binary",
- "-ensure-file",
- "infra_internal/ios/xcode/xcode_binaries/${platform} yjQtk3auAegQO4t18uBtBlKbj76xBjVtLE-3UM2faRUC",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "cwd": "[CACHE]/builder",
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "GOMA_DIR": "[CACHE]/goma/client"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "name": "ensure_installed (3)",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@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-yjQtk3auAegQO4t1\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/ios/xcode/xcode_binaries/resolved-platform\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
"gem",
"install",
"jazzy:0.8.4",
@@ -6839,8 +6793,7 @@
"cwd": "[START_DIR]/gems",
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "GOMA_DIR": "[CACHE]/goma/client",
- "SDKROOT": "[CACHE]/xcode_binary/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk"
+ "GOMA_DIR": "[CACHE]/goma/client"
},
"env_prefixes": {
"PATH": [
diff --git a/recipes/engine_1_22_0.expected/mac_upload_publish_cipd.json b/recipes/engine_1_22_0.expected/mac_upload_publish_cipd.json
index 3214f72..3214eea 100644
--- a/recipes/engine_1_22_0.expected/mac_upload_publish_cipd.json
+++ b/recipes/engine_1_22_0.expected/mac_upload_publish_cipd.json
@@ -6777,52 +6777,6 @@
},
{
"cmd": [
- "cipd",
- "ensure",
- "-root",
- "[CACHE]/xcode_binary",
- "-ensure-file",
- "infra_internal/ios/xcode/xcode_binaries/${platform} yjQtk3auAegQO4t18uBtBlKbj76xBjVtLE-3UM2faRUC",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "cwd": "[CACHE]/builder",
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "GOMA_DIR": "[CACHE]/goma/client"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "name": "ensure_installed (3)",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@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-yjQtk3auAegQO4t1\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/ios/xcode/xcode_binaries/resolved-platform\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
"gem",
"install",
"jazzy:0.8.4",
@@ -6832,8 +6786,7 @@
"cwd": "[START_DIR]/gems",
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "GOMA_DIR": "[CACHE]/goma/client",
- "SDKROOT": "[CACHE]/xcode_binary/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk"
+ "GOMA_DIR": "[CACHE]/goma/client"
},
"env_prefixes": {
"PATH": [
diff --git a/recipes/engine_1_22_0.expected/mac_upload_publish_cipd_no_lto.json b/recipes/engine_1_22_0.expected/mac_upload_publish_cipd_no_lto.json
index b216db8..ebcd87e 100644
--- a/recipes/engine_1_22_0.expected/mac_upload_publish_cipd_no_lto.json
+++ b/recipes/engine_1_22_0.expected/mac_upload_publish_cipd_no_lto.json
@@ -6784,52 +6784,6 @@
},
{
"cmd": [
- "cipd",
- "ensure",
- "-root",
- "[CACHE]/xcode_binary",
- "-ensure-file",
- "infra_internal/ios/xcode/xcode_binaries/${platform} yjQtk3auAegQO4t18uBtBlKbj76xBjVtLE-3UM2faRUC",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "cwd": "[CACHE]/builder",
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "GOMA_DIR": "[CACHE]/goma/client"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "name": "ensure_installed (3)",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@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-yjQtk3auAegQO4t1\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/ios/xcode/xcode_binaries/resolved-platform\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
"gem",
"install",
"jazzy:0.8.4",
@@ -6839,8 +6793,7 @@
"cwd": "[START_DIR]/gems",
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "GOMA_DIR": "[CACHE]/goma/client",
- "SDKROOT": "[CACHE]/xcode_binary/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk"
+ "GOMA_DIR": "[CACHE]/goma/client"
},
"env_prefixes": {
"PATH": [
diff --git a/recipes/engine_1_22_0.expected/safeupload_raise_on_duplicate.json b/recipes/engine_1_22_0.expected/safeupload_raise_on_duplicate.json
index 99b31f0..82a7648 100644
--- a/recipes/engine_1_22_0.expected/safeupload_raise_on_duplicate.json
+++ b/recipes/engine_1_22_0.expected/safeupload_raise_on_duplicate.json
@@ -2239,7 +2239,7 @@
"The recipe has crashed at point 'Uncaught exception'!",
"",
"Traceback (most recent call last):",
- " File \"RECIPE_REPO[flutter]/recipes/engine_1_22_0.py\", line 1552, in RunSteps",
+ " File \"RECIPE_REPO[flutter]/recipes/engine_1_22_0.py\", line 1529, in RunSteps",
" BuildLinux(api)",
" File \"RECIPE_REPO[flutter]/recipes/engine_1_22_0.py\", line 704, in BuildLinux",
" 'out/host_debug_unopt/gen/frontend_server.dart.snapshot',",
diff --git a/recipes/engine_1_22_0.py b/recipes/engine_1_22_0.py
index 86656f9..20f2ef4 100644
--- a/recipes/engine_1_22_0.py
+++ b/recipes/engine_1_22_0.py
@@ -1439,30 +1439,6 @@
GetCloudPath(api, 'android-javadoc.zip'))
-# The MacOSX10.15 SDK included in Xcode 11 does not ship Ruby 2.3 headers,
-# so jazzy installation will fail on MacOS 10.14 + Xcode 11. Workaround
-# that by specifying an external MacOSX10.14 SDK to use during gem installation.
-#
-# TODO(https://crbug.com/998883): remove this method and all references to it
-# once the bots are upgraded to MacOS 10.15.
-@contextmanager
-def SetupMacOSSDK(api):
- xcode_binary_cache_dir = api.path['cache'].join('xcode_binary')
- # Pull a trimmed version of Xcode 10.2.1(10E1001) that contains the MacOS
- # 10.14 SDK needed for installing gems. This does not affect what
- # `xcode-select -p` points to.
- api.cipd.ensure(
- xcode_binary_cache_dir,
- api.cipd.EnsureFile().add_package(
- 'infra_internal/ios/xcode/xcode_binaries/${platform}',
- 'yjQtk3auAegQO4t18uBtBlKbj76xBjVtLE-3UM2faRUC'))
-
- # Override SDKROOT during gem installation.
- sdk_relative_path = 'Contents/Developer/Platforms/' \
- 'MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk'
- with api.context(
- env={"SDKROOT": xcode_binary_cache_dir.join(sdk_relative_path)}):
- yield
@contextmanager
@@ -1470,14 +1446,15 @@
gem_dir = api.path['start_dir'].join('gems')
api.file.ensure_directory('mkdir gems', gem_dir)
- with SetupMacOSSDK(api):
- with api.context(cwd=gem_dir):
- api.step('install jazzy', [
- 'gem', 'install', 'jazzy:' + api.properties['jazzy_version'],
- '--install-dir', '.'
- ])
- with api.context(
- env={"GEM_HOME": gem_dir}, env_prefixes={'PATH': [gem_dir.join('bin')]}):
+ with api.context(cwd=gem_dir):
+ api.step(
+ 'install jazzy', [
+ 'gem', 'install', 'jazzy:' + api.properties['jazzy_version'],
+ '--install-dir', '.'
+ ]
+ )
+ with api.context(env={"GEM_HOME": gem_dir},
+ env_prefixes={'PATH': [gem_dir.join('bin')]}):
yield
@@ -1591,9 +1568,9 @@
for no_lto in (True, False):
test = api.test(
'%s%s%s%s%s' % (platform, '_upload' if should_upload else '',
- '_maven_or_bitcode' if maven_or_bitcode else '',
- '_publish_cipd' if should_publish_cipd else '',
- '_no_lto' if no_lto else ''),
+ '_maven_or_bitcode' if maven_or_bitcode else '',
+ '_publish_cipd' if should_publish_cipd else '',
+ '_no_lto' if no_lto else ''),
api.platform(platform, 64),
api.buildbucket.ci_build(
builder='%s Engine' % platform.capitalize(),
