Force drone to use flutter xcode packages. Flutter Drone was using the package from chromium that required to install swift separately. Change-Id: I0d5ff9b4ad8bb46086d263102b13827cf591692a Bug: https://github.com/flutter/flutter/issues/72823 Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/9481 Reviewed-by: Casey Hillers <chillers@google.com> Commit-Queue: Godofredo Contreras <godofredoc@google.com>
diff --git a/recipe_modules/shard_util/api.py b/recipe_modules/shard_util/api.py index 0618471..a416ae2 100644 --- a/recipe_modules/shard_util/api.py +++ b/recipe_modules/shard_util/api.py
@@ -46,6 +46,11 @@ self.m.properties.get('$depot_tools/osx_sdk' ).get('sdk_version') } + if self.m.properties.get('$flutter/osx_sdk'): + drone_props['$flutter/osx_sdk'] = { + "sdk_version": + self.m.properties.get('$flutter/osx_sdk').get('sdk_version') + } # Drone_dimensions property from the parent builder will override the # default drone properties if not empty. drone_dimensions = self.m.properties.get('drone_dimensions', [])
diff --git a/recipe_modules/shard_util/examples/full.expected/presubmit.json b/recipe_modules/shard_util/examples/full.expected/presubmit.json index a86abaf..8b0899d 100644 --- a/recipe_modules/shard_util/examples/full.expected/presubmit.json +++ b/recipe_modules/shard_util/examples/full.expected/presubmit.json
@@ -8,7 +8,7 @@ ], "infra_step": true, "name": "buildbucket.schedule", - "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"builder\": \"Linux SDK Drone\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Windows Server\"}], \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"priority\": 25, \"properties\": {\"$depot_tools/osx_sdk\": {\"sdk_version\": \"11a420a\"}, \"android_sdk_license\": \"\", \"android_sdk_preview_license\": \"\", \"dependencies\": [{\"dependency\": \"android_sdk\"}, {\"dependency\": \"chrome_and_driver\"}], \"git_ref\": \"abc\", \"git_url\": \"https://abc\", \"shard\": \"\", \"subshard\": \"0\", \"task_name\": \"-0\"}, \"requestId\": \"0-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}, {\"scheduleBuild\": {\"builder\": {\"builder\": \"Linux SDK Drone\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Windows Server\"}], \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"priority\": 25, \"properties\": {\"$depot_tools/osx_sdk\": {\"sdk_version\": \"11a420a\"}, \"android_sdk_license\": \"\", \"android_sdk_preview_license\": \"\", \"dependencies\": [{\"dependency\": \"android_sdk\"}, {\"dependency\": \"chrome_and_driver\"}], \"git_ref\": \"abc\", \"git_url\": \"https://abc\", \"shard\": \"\", \"subshard\": \"1_last\", \"task_name\": \"-1_last\"}, \"requestId\": \"0-00000000-0000-0000-0000-00000000133a\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}", + "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"builder\": \"Linux SDK Drone\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Windows Server\"}], \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"priority\": 25, \"properties\": {\"$depot_tools/osx_sdk\": {\"sdk_version\": \"11a420a\"}, \"$flutter/osx_sdk\": {\"sdk_version\": \"11a420a\"}, \"android_sdk_license\": \"\", \"android_sdk_preview_license\": \"\", \"dependencies\": [{\"dependency\": \"android_sdk\"}, {\"dependency\": \"chrome_and_driver\"}], \"git_ref\": \"abc\", \"git_url\": \"https://abc\", \"shard\": \"\", \"subshard\": \"0\", \"task_name\": \"-0\"}, \"requestId\": \"0-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}, {\"scheduleBuild\": {\"builder\": {\"builder\": \"Linux SDK Drone\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Windows Server\"}], \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"priority\": 25, \"properties\": {\"$depot_tools/osx_sdk\": {\"sdk_version\": \"11a420a\"}, \"$flutter/osx_sdk\": {\"sdk_version\": \"11a420a\"}, \"android_sdk_license\": \"\", \"android_sdk_preview_license\": \"\", \"dependencies\": [{\"dependency\": \"android_sdk\"}, {\"dependency\": \"chrome_and_driver\"}], \"git_ref\": \"abc\", \"git_url\": \"https://abc\", \"shard\": \"\", \"subshard\": \"1_last\", \"task_name\": \"-1_last\"}, \"requestId\": \"0-00000000-0000-0000-0000-00000000133a\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}", "~followup_annotations": [ "@@@STEP_LOG_LINE@json.output@{@@@", "@@@STEP_LOG_LINE@json.output@ \"responses\": [@@@", @@ -51,6 +51,9 @@ "@@@STEP_LOG_LINE@request@ \"$depot_tools/osx_sdk\": {@@@", "@@@STEP_LOG_LINE@request@ \"sdk_version\": \"11a420a\"@@@", "@@@STEP_LOG_LINE@request@ }, @@@", + "@@@STEP_LOG_LINE@request@ \"$flutter/osx_sdk\": {@@@", + "@@@STEP_LOG_LINE@request@ \"sdk_version\": \"11a420a\"@@@", + "@@@STEP_LOG_LINE@request@ }, @@@", "@@@STEP_LOG_LINE@request@ \"android_sdk_license\": \"\", @@@", "@@@STEP_LOG_LINE@request@ \"android_sdk_preview_license\": \"\", @@@", "@@@STEP_LOG_LINE@request@ \"dependencies\": [@@@", @@ -97,6 +100,9 @@ "@@@STEP_LOG_LINE@request@ \"$depot_tools/osx_sdk\": {@@@", "@@@STEP_LOG_LINE@request@ \"sdk_version\": \"11a420a\"@@@", "@@@STEP_LOG_LINE@request@ }, @@@", + "@@@STEP_LOG_LINE@request@ \"$flutter/osx_sdk\": {@@@", + "@@@STEP_LOG_LINE@request@ \"sdk_version\": \"11a420a\"@@@", + "@@@STEP_LOG_LINE@request@ }, @@@", "@@@STEP_LOG_LINE@request@ \"android_sdk_license\": \"\", @@@", "@@@STEP_LOG_LINE@request@ \"android_sdk_preview_license\": \"\", @@@", "@@@STEP_LOG_LINE@request@ \"dependencies\": [@@@",
diff --git a/recipe_modules/shard_util/examples/full.py b/recipe_modules/shard_util/examples/full.py index 8170ecc..509ef1a 100644 --- a/recipe_modules/shard_util/examples/full.py +++ b/recipe_modules/shard_util/examples/full.py
@@ -26,6 +26,7 @@ 'dependencies': [{"dependency": "android_sdk"}, {"dependency": "chrome_and_driver"}], '$depot_tools/osx_sdk': {"sdk_version": "11a420a"}, + '$flutter/osx_sdk': {"sdk_version": "11a420a"}, 'gems': [["cocoapods", "1.6.0"]], 'drone_dimensions': ['os=Windows Server'] }
diff --git a/recipes/flutter/flutter_drone.py b/recipes/flutter/flutter_drone.py index ae37bcf..8e2527e 100644 --- a/recipes/flutter/flutter_drone.py +++ b/recipes/flutter/flutter_drone.py
@@ -9,11 +9,11 @@ import re DEPS = [ - 'depot_tools/osx_sdk', 'flutter/android_sdk', - 'flutter/repo_util', 'flutter/flutter_deps', 'flutter/os_utils', + 'flutter/osx_sdk', + 'flutter/repo_util', 'recipe_engine/context', 'recipe_engine/path', 'recipe_engine/properties',