make iostools config read from framework ci.yaml
Change-Id: Iae8a8cff21b462e7b8b46336afb74e9a17911123
Reviewed-on: https://flutter-review.googlesource.com/c/infra/+/25860
Reviewed-by: Casey Hillers <chillers@google.com>
Commit-Queue: Christopher Fujino <fujino@google.com>
diff --git a/config/generated/flutter/luci/cr-buildbucket.cfg b/config/generated/flutter/luci/cr-buildbucket.cfg
index 35be783..e1a5d7b 100644
--- a/config/generated/flutter/luci/cr-buildbucket.cfg
+++ b/config/generated/flutter/luci/cr-buildbucket.cfg
@@ -106385,7 +106385,8 @@
builders {
name: "ideviceinstaller"
swarming_host: "chromium-swarm.appspot.com"
- dimensions: "os:Mac-10.15"
+ dimensions: "device_type:none"
+ dimensions: "os:Mac-12.0"
dimensions: "pool:luci.flutter.prod"
exe {
cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -106394,9 +106395,6 @@
}
properties:
'{'
- ' "$flutter/osx_sdk": {'
- ' "sdk_version": "13a233"'
- ' },'
' "$fuchsia/goma": {'
' "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
' },'
@@ -106409,15 +106407,95 @@
' "$recipe_engine/swarming": {'
' "server": "https://chromium-swarm.appspot.com"'
' },'
+ ' "caches": ['
+ ' {'
+ ' "name": "builder_mac_devicelab",'
+ ' "path": "builder"'
+ ' },'
+ ' {'
+ ' "name": "chrome_and_driver",'
+ ' "path": "chrome"'
+ ' },'
+ ' {'
+ ' "name": "flutter_sdk",'
+ ' "path": "flutter sdk"'
+ ' },'
+ ' {'
+ ' "name": "gradle",'
+ ' "path": "gradle"'
+ ' },'
+ ' {'
+ ' "name": "openjdk",'
+ ' "path": "java"'
+ ' },'
+ ' {'
+ ' "name": "pub_cache",'
+ ' "path": ".pub-cache"'
+ ' },'
+ ' {'
+ ' "name": "xcode_binary",'
+ ' "path": "xcode_binary"'
+ ' },'
+ ' {'
+ ' "name": "osx_sdk",'
+ ' "path": "osx_sdk"'
+ ' }'
+ ' ],'
' "clobber": false,'
+ ' "dependencies": ['
+ ' {'
+ ' "dependency": "xcode"'
+ ' },'
+ ' {'
+ ' "dependency": "gems"'
+ ' },'
+ ' {'
+ ' "dependency": "ios_signing"'
+ ' }'
+ ' ],'
+ ' "device_os": "iOS-15.1",'
' "gold_tryjob": false,'
' "goma_jobs": "200",'
' "mastername": "client.flutter",'
+ ' "os": "Mac-12.0",'
' "package_name": "ideviceinstaller-flutter",'
' "recipe": "ios-usb-dependencies",'
- ' "upload_packages": true'
+ ' "upload_packages": true,'
+ ' "xcode": "13a233"'
'}'
execution_timeout_secs: 3600
+ caches {
+ name: "builder_mac_devicelab"
+ path: "builder"
+ }
+ caches {
+ name: "chrome_and_driver"
+ path: "chrome"
+ }
+ caches {
+ name: "flutter_sdk"
+ path: "flutter sdk"
+ }
+ caches {
+ name: "gradle"
+ path: "gradle"
+ }
+ caches {
+ name: "openjdk"
+ path: "java"
+ }
+ caches {
+ name: "osx_sdk"
+ path: "osx_sdk"
+ }
+ caches {
+ name: "pub_cache"
+ path: ".pub-cache"
+ }
+ caches {
+ name: "xcode_binary"
+ path: "xcode_binary"
+ }
build_numbers: YES
service_account: "flutter-prod-builder@chops-service-accounts.iam.gserviceaccount.com"
task_template_canary_percentage {}
@@ -106433,7 +106511,8 @@
builders {
name: "ios-deploy"
swarming_host: "chromium-swarm.appspot.com"
- dimensions: "os:Mac-10.15"
+ dimensions: "device_type:none"
+ dimensions: "os:Mac-12.0"
dimensions: "pool:luci.flutter.prod"
exe {
cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -106442,9 +106521,6 @@
}
properties:
'{'
- ' "$flutter/osx_sdk": {'
- ' "sdk_version": "13a233"'
- ' },'
' "$fuchsia/goma": {'
' "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
' },'
@@ -106457,15 +106533,95 @@
' "$recipe_engine/swarming": {'
' "server": "https://chromium-swarm.appspot.com"'
' },'
+ ' "caches": ['
+ ' {'
+ ' "name": "builder_mac_devicelab",'
+ ' "path": "builder"'
+ ' },'
+ ' {'
+ ' "name": "chrome_and_driver",'
+ ' "path": "chrome"'
+ ' },'
+ ' {'
+ ' "name": "flutter_sdk",'
+ ' "path": "flutter sdk"'
+ ' },'
+ ' {'
+ ' "name": "gradle",'
+ ' "path": "gradle"'
+ ' },'
+ ' {'
+ ' "name": "openjdk",'
+ ' "path": "java"'
+ ' },'
+ ' {'
+ ' "name": "pub_cache",'
+ ' "path": ".pub-cache"'
+ ' },'
+ ' {'
+ ' "name": "xcode_binary",'
+ ' "path": "xcode_binary"'
+ ' },'
+ ' {'
+ ' "name": "osx_sdk",'
+ ' "path": "osx_sdk"'
+ ' }'
+ ' ],'
' "clobber": false,'
+ ' "dependencies": ['
+ ' {'
+ ' "dependency": "xcode"'
+ ' },'
+ ' {'
+ ' "dependency": "gems"'
+ ' },'
+ ' {'
+ ' "dependency": "ios_signing"'
+ ' }'
+ ' ],'
+ ' "device_os": "iOS-15.1",'
' "gold_tryjob": false,'
' "goma_jobs": "200",'
' "mastername": "client.flutter",'
+ ' "os": "Mac-12.0",'
' "package_name": "ios-deploy-flutter",'
' "recipe": "ios-usb-dependencies",'
- ' "upload_packages": true'
+ ' "upload_packages": true,'
+ ' "xcode": "13a233"'
'}'
execution_timeout_secs: 3600
+ caches {
+ name: "builder_mac_devicelab"
+ path: "builder"
+ }
+ caches {
+ name: "chrome_and_driver"
+ path: "chrome"
+ }
+ caches {
+ name: "flutter_sdk"
+ path: "flutter sdk"
+ }
+ caches {
+ name: "gradle"
+ path: "gradle"
+ }
+ caches {
+ name: "openjdk"
+ path: "java"
+ }
+ caches {
+ name: "osx_sdk"
+ path: "osx_sdk"
+ }
+ caches {
+ name: "pub_cache"
+ path: ".pub-cache"
+ }
+ caches {
+ name: "xcode_binary"
+ path: "xcode_binary"
+ }
build_numbers: YES
service_account: "flutter-prod-builder@chops-service-accounts.iam.gserviceaccount.com"
task_template_canary_percentage {}
@@ -106481,7 +106637,8 @@
builders {
name: "libimobiledevice"
swarming_host: "chromium-swarm.appspot.com"
- dimensions: "os:Mac-10.15"
+ dimensions: "device_type:none"
+ dimensions: "os:Mac-12.0"
dimensions: "pool:luci.flutter.prod"
exe {
cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -106490,9 +106647,6 @@
}
properties:
'{'
- ' "$flutter/osx_sdk": {'
- ' "sdk_version": "13a233"'
- ' },'
' "$fuchsia/goma": {'
' "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
' },'
@@ -106505,15 +106659,95 @@
' "$recipe_engine/swarming": {'
' "server": "https://chromium-swarm.appspot.com"'
' },'
+ ' "caches": ['
+ ' {'
+ ' "name": "builder_mac_devicelab",'
+ ' "path": "builder"'
+ ' },'
+ ' {'
+ ' "name": "chrome_and_driver",'
+ ' "path": "chrome"'
+ ' },'
+ ' {'
+ ' "name": "flutter_sdk",'
+ ' "path": "flutter sdk"'
+ ' },'
+ ' {'
+ ' "name": "gradle",'
+ ' "path": "gradle"'
+ ' },'
+ ' {'
+ ' "name": "openjdk",'
+ ' "path": "java"'
+ ' },'
+ ' {'
+ ' "name": "pub_cache",'
+ ' "path": ".pub-cache"'
+ ' },'
+ ' {'
+ ' "name": "xcode_binary",'
+ ' "path": "xcode_binary"'
+ ' },'
+ ' {'
+ ' "name": "osx_sdk",'
+ ' "path": "osx_sdk"'
+ ' }'
+ ' ],'
' "clobber": false,'
+ ' "dependencies": ['
+ ' {'
+ ' "dependency": "xcode"'
+ ' },'
+ ' {'
+ ' "dependency": "gems"'
+ ' },'
+ ' {'
+ ' "dependency": "ios_signing"'
+ ' }'
+ ' ],'
+ ' "device_os": "iOS-15.1",'
' "gold_tryjob": false,'
' "goma_jobs": "200",'
' "mastername": "client.flutter",'
+ ' "os": "Mac-12.0",'
' "package_name": "libimobiledevice-flutter",'
' "recipe": "ios-usb-dependencies",'
- ' "upload_packages": true'
+ ' "upload_packages": true,'
+ ' "xcode": "13a233"'
'}'
execution_timeout_secs: 3600
+ caches {
+ name: "builder_mac_devicelab"
+ path: "builder"
+ }
+ caches {
+ name: "chrome_and_driver"
+ path: "chrome"
+ }
+ caches {
+ name: "flutter_sdk"
+ path: "flutter sdk"
+ }
+ caches {
+ name: "gradle"
+ path: "gradle"
+ }
+ caches {
+ name: "openjdk"
+ path: "java"
+ }
+ caches {
+ name: "osx_sdk"
+ path: "osx_sdk"
+ }
+ caches {
+ name: "pub_cache"
+ path: ".pub-cache"
+ }
+ caches {
+ name: "xcode_binary"
+ path: "xcode_binary"
+ }
build_numbers: YES
service_account: "flutter-prod-builder@chops-service-accounts.iam.gserviceaccount.com"
task_template_canary_percentage {}
@@ -106529,7 +106763,8 @@
builders {
name: "libplist"
swarming_host: "chromium-swarm.appspot.com"
- dimensions: "os:Mac-10.15"
+ dimensions: "device_type:none"
+ dimensions: "os:Mac-12.0"
dimensions: "pool:luci.flutter.prod"
exe {
cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -106538,9 +106773,6 @@
}
properties:
'{'
- ' "$flutter/osx_sdk": {'
- ' "sdk_version": "13a233"'
- ' },'
' "$fuchsia/goma": {'
' "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
' },'
@@ -106553,15 +106785,95 @@
' "$recipe_engine/swarming": {'
' "server": "https://chromium-swarm.appspot.com"'
' },'
+ ' "caches": ['
+ ' {'
+ ' "name": "builder_mac_devicelab",'
+ ' "path": "builder"'
+ ' },'
+ ' {'
+ ' "name": "chrome_and_driver",'
+ ' "path": "chrome"'
+ ' },'
+ ' {'
+ ' "name": "flutter_sdk",'
+ ' "path": "flutter sdk"'
+ ' },'
+ ' {'
+ ' "name": "gradle",'
+ ' "path": "gradle"'
+ ' },'
+ ' {'
+ ' "name": "openjdk",'
+ ' "path": "java"'
+ ' },'
+ ' {'
+ ' "name": "pub_cache",'
+ ' "path": ".pub-cache"'
+ ' },'
+ ' {'
+ ' "name": "xcode_binary",'
+ ' "path": "xcode_binary"'
+ ' },'
+ ' {'
+ ' "name": "osx_sdk",'
+ ' "path": "osx_sdk"'
+ ' }'
+ ' ],'
' "clobber": false,'
+ ' "dependencies": ['
+ ' {'
+ ' "dependency": "xcode"'
+ ' },'
+ ' {'
+ ' "dependency": "gems"'
+ ' },'
+ ' {'
+ ' "dependency": "ios_signing"'
+ ' }'
+ ' ],'
+ ' "device_os": "iOS-15.1",'
' "gold_tryjob": false,'
' "goma_jobs": "200",'
' "mastername": "client.flutter",'
+ ' "os": "Mac-12.0",'
' "package_name": "libplist-flutter",'
' "recipe": "ios-usb-dependencies",'
- ' "upload_packages": true'
+ ' "upload_packages": true,'
+ ' "xcode": "13a233"'
'}'
execution_timeout_secs: 3600
+ caches {
+ name: "builder_mac_devicelab"
+ path: "builder"
+ }
+ caches {
+ name: "chrome_and_driver"
+ path: "chrome"
+ }
+ caches {
+ name: "flutter_sdk"
+ path: "flutter sdk"
+ }
+ caches {
+ name: "gradle"
+ path: "gradle"
+ }
+ caches {
+ name: "openjdk"
+ path: "java"
+ }
+ caches {
+ name: "osx_sdk"
+ path: "osx_sdk"
+ }
+ caches {
+ name: "pub_cache"
+ path: ".pub-cache"
+ }
+ caches {
+ name: "xcode_binary"
+ path: "xcode_binary"
+ }
build_numbers: YES
service_account: "flutter-prod-builder@chops-service-accounts.iam.gserviceaccount.com"
task_template_canary_percentage {}
@@ -106577,7 +106889,8 @@
builders {
name: "libzip"
swarming_host: "chromium-swarm.appspot.com"
- dimensions: "os:Mac-10.15"
+ dimensions: "device_type:none"
+ dimensions: "os:Mac-12.0"
dimensions: "pool:luci.flutter.prod"
exe {
cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -106586,9 +106899,6 @@
}
properties:
'{'
- ' "$flutter/osx_sdk": {'
- ' "sdk_version": "13a233"'
- ' },'
' "$fuchsia/goma": {'
' "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
' },'
@@ -106601,15 +106911,95 @@
' "$recipe_engine/swarming": {'
' "server": "https://chromium-swarm.appspot.com"'
' },'
+ ' "caches": ['
+ ' {'
+ ' "name": "builder_mac_devicelab",'
+ ' "path": "builder"'
+ ' },'
+ ' {'
+ ' "name": "chrome_and_driver",'
+ ' "path": "chrome"'
+ ' },'
+ ' {'
+ ' "name": "flutter_sdk",'
+ ' "path": "flutter sdk"'
+ ' },'
+ ' {'
+ ' "name": "gradle",'
+ ' "path": "gradle"'
+ ' },'
+ ' {'
+ ' "name": "openjdk",'
+ ' "path": "java"'
+ ' },'
+ ' {'
+ ' "name": "pub_cache",'
+ ' "path": ".pub-cache"'
+ ' },'
+ ' {'
+ ' "name": "xcode_binary",'
+ ' "path": "xcode_binary"'
+ ' },'
+ ' {'
+ ' "name": "osx_sdk",'
+ ' "path": "osx_sdk"'
+ ' }'
+ ' ],'
' "clobber": false,'
+ ' "dependencies": ['
+ ' {'
+ ' "dependency": "xcode"'
+ ' },'
+ ' {'
+ ' "dependency": "gems"'
+ ' },'
+ ' {'
+ ' "dependency": "ios_signing"'
+ ' }'
+ ' ],'
+ ' "device_os": "iOS-15.1",'
' "gold_tryjob": false,'
' "goma_jobs": "200",'
' "mastername": "client.flutter",'
+ ' "os": "Mac-12.0",'
' "package_name": "libzip-flutter",'
' "recipe": "ios-usb-dependencies",'
- ' "upload_packages": true'
+ ' "upload_packages": true,'
+ ' "xcode": "13a233"'
'}'
execution_timeout_secs: 3600
+ caches {
+ name: "builder_mac_devicelab"
+ path: "builder"
+ }
+ caches {
+ name: "chrome_and_driver"
+ path: "chrome"
+ }
+ caches {
+ name: "flutter_sdk"
+ path: "flutter sdk"
+ }
+ caches {
+ name: "gradle"
+ path: "gradle"
+ }
+ caches {
+ name: "openjdk"
+ path: "java"
+ }
+ caches {
+ name: "osx_sdk"
+ path: "osx_sdk"
+ }
+ caches {
+ name: "pub_cache"
+ path: ".pub-cache"
+ }
+ caches {
+ name: "xcode_binary"
+ path: "xcode_binary"
+ }
build_numbers: YES
service_account: "flutter-prod-builder@chops-service-accounts.iam.gserviceaccount.com"
task_template_canary_percentage {}
@@ -106625,7 +107015,8 @@
builders {
name: "openssl"
swarming_host: "chromium-swarm.appspot.com"
- dimensions: "os:Mac-10.15"
+ dimensions: "device_type:none"
+ dimensions: "os:Mac-12.0"
dimensions: "pool:luci.flutter.prod"
exe {
cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -106634,9 +107025,6 @@
}
properties:
'{'
- ' "$flutter/osx_sdk": {'
- ' "sdk_version": "13a233"'
- ' },'
' "$fuchsia/goma": {'
' "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
' },'
@@ -106649,15 +107037,95 @@
' "$recipe_engine/swarming": {'
' "server": "https://chromium-swarm.appspot.com"'
' },'
+ ' "caches": ['
+ ' {'
+ ' "name": "builder_mac_devicelab",'
+ ' "path": "builder"'
+ ' },'
+ ' {'
+ ' "name": "chrome_and_driver",'
+ ' "path": "chrome"'
+ ' },'
+ ' {'
+ ' "name": "flutter_sdk",'
+ ' "path": "flutter sdk"'
+ ' },'
+ ' {'
+ ' "name": "gradle",'
+ ' "path": "gradle"'
+ ' },'
+ ' {'
+ ' "name": "openjdk",'
+ ' "path": "java"'
+ ' },'
+ ' {'
+ ' "name": "pub_cache",'
+ ' "path": ".pub-cache"'
+ ' },'
+ ' {'
+ ' "name": "xcode_binary",'
+ ' "path": "xcode_binary"'
+ ' },'
+ ' {'
+ ' "name": "osx_sdk",'
+ ' "path": "osx_sdk"'
+ ' }'
+ ' ],'
' "clobber": false,'
+ ' "dependencies": ['
+ ' {'
+ ' "dependency": "xcode"'
+ ' },'
+ ' {'
+ ' "dependency": "gems"'
+ ' },'
+ ' {'
+ ' "dependency": "ios_signing"'
+ ' }'
+ ' ],'
+ ' "device_os": "iOS-15.1",'
' "gold_tryjob": false,'
' "goma_jobs": "200",'
' "mastername": "client.flutter",'
+ ' "os": "Mac-12.0",'
' "package_name": "openssl-flutter",'
' "recipe": "ios-usb-dependencies",'
- ' "upload_packages": true'
+ ' "upload_packages": true,'
+ ' "xcode": "13a233"'
'}'
execution_timeout_secs: 3600
+ caches {
+ name: "builder_mac_devicelab"
+ path: "builder"
+ }
+ caches {
+ name: "chrome_and_driver"
+ path: "chrome"
+ }
+ caches {
+ name: "flutter_sdk"
+ path: "flutter sdk"
+ }
+ caches {
+ name: "gradle"
+ path: "gradle"
+ }
+ caches {
+ name: "openjdk"
+ path: "java"
+ }
+ caches {
+ name: "osx_sdk"
+ path: "osx_sdk"
+ }
+ caches {
+ name: "pub_cache"
+ path: ".pub-cache"
+ }
+ caches {
+ name: "xcode_binary"
+ path: "xcode_binary"
+ }
build_numbers: YES
service_account: "flutter-prod-builder@chops-service-accounts.iam.gserviceaccount.com"
task_template_canary_percentage {}
@@ -107225,7 +107693,8 @@
builders {
name: "usbmuxd"
swarming_host: "chromium-swarm.appspot.com"
- dimensions: "os:Mac-10.15"
+ dimensions: "device_type:none"
+ dimensions: "os:Mac-12.0"
dimensions: "pool:luci.flutter.prod"
exe {
cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -107234,9 +107703,6 @@
}
properties:
'{'
- ' "$flutter/osx_sdk": {'
- ' "sdk_version": "13a233"'
- ' },'
' "$fuchsia/goma": {'
' "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
' },'
@@ -107249,15 +107715,95 @@
' "$recipe_engine/swarming": {'
' "server": "https://chromium-swarm.appspot.com"'
' },'
+ ' "caches": ['
+ ' {'
+ ' "name": "builder_mac_devicelab",'
+ ' "path": "builder"'
+ ' },'
+ ' {'
+ ' "name": "chrome_and_driver",'
+ ' "path": "chrome"'
+ ' },'
+ ' {'
+ ' "name": "flutter_sdk",'
+ ' "path": "flutter sdk"'
+ ' },'
+ ' {'
+ ' "name": "gradle",'
+ ' "path": "gradle"'
+ ' },'
+ ' {'
+ ' "name": "openjdk",'
+ ' "path": "java"'
+ ' },'
+ ' {'
+ ' "name": "pub_cache",'
+ ' "path": ".pub-cache"'
+ ' },'
+ ' {'
+ ' "name": "xcode_binary",'
+ ' "path": "xcode_binary"'
+ ' },'
+ ' {'
+ ' "name": "osx_sdk",'
+ ' "path": "osx_sdk"'
+ ' }'
+ ' ],'
' "clobber": false,'
+ ' "dependencies": ['
+ ' {'
+ ' "dependency": "xcode"'
+ ' },'
+ ' {'
+ ' "dependency": "gems"'
+ ' },'
+ ' {'
+ ' "dependency": "ios_signing"'
+ ' }'
+ ' ],'
+ ' "device_os": "iOS-15.1",'
' "gold_tryjob": false,'
' "goma_jobs": "200",'
' "mastername": "client.flutter",'
+ ' "os": "Mac-12.0",'
' "package_name": "usbmuxd-flutter",'
' "recipe": "ios-usb-dependencies",'
- ' "upload_packages": true'
+ ' "upload_packages": true,'
+ ' "xcode": "13a233"'
'}'
execution_timeout_secs: 3600
+ caches {
+ name: "builder_mac_devicelab"
+ path: "builder"
+ }
+ caches {
+ name: "chrome_and_driver"
+ path: "chrome"
+ }
+ caches {
+ name: "flutter_sdk"
+ path: "flutter sdk"
+ }
+ caches {
+ name: "gradle"
+ path: "gradle"
+ }
+ caches {
+ name: "openjdk"
+ path: "java"
+ }
+ caches {
+ name: "osx_sdk"
+ path: "osx_sdk"
+ }
+ caches {
+ name: "pub_cache"
+ path: ".pub-cache"
+ }
+ caches {
+ name: "xcode_binary"
+ path: "xcode_binary"
+ }
build_numbers: YES
service_account: "flutter-prod-builder@chops-service-accounts.iam.gserviceaccount.com"
task_template_canary_percentage {}
diff --git a/config/iostools_config.star b/config/iostools_config.star
index 3ebe189..8b47e19 100644
--- a/config/iostools_config.star
+++ b/config/iostools_config.star
@@ -11,10 +11,9 @@
load("//lib/common.star", "common")
load("//lib/consoles.star", "consoles")
+load("//lib/helpers.star", "helpers")
load("//lib/repos.star", "repos")
-
-# Global OS variables
-MAC_OS = "Mac-10.15"
+load("//lib/ci_yaml/ci_yaml.star", "ci_yaml")
def _setup():
luci.recipe(
@@ -41,21 +40,29 @@
repo = repo,
triggers = [builder],
)
+
+ # re-use the config from the framework
+ ci_yaml_config = ci_yaml.ci_yaml("flutter", "master")
+ platform_properties = ci_yaml.platform_properties(ci_yaml_config)
+
+ # The "mac_ios" shards will have the latest Xcode version
+ platform_key = "mac_ios"
+ properties = helpers.merge_dicts(
+ platform_properties[platform_key],
+ {"package_name": builder + "-flutter"},
+ )
common.mac_prod_builder(
name = name,
repo = repo,
recipe = "ios-usb-dependencies",
- properties = {
- "package_name": builder + "-flutter",
- "$flutter/osx_sdk": {
- "sdk_version": "13a233",
- },
- },
console_view_name = builder,
+ dimensions = {"device_type": "none"},
+ caches = ci_yaml.swarming_caches(ci_yaml_config, None, platform_key),
+ properties = properties,
+ os = platform_properties[platform_key]["os"],
triggering_policy = scheduler.greedy_batching(
max_concurrent_invocations = 1,
),
- os = MAC_OS,
)
def iostools_prod_config():
diff --git a/config/packaging_config.star b/config/packaging_config.star
index f55d197..ba2cb73 100644
--- a/config/packaging_config.star
+++ b/config/packaging_config.star
@@ -53,8 +53,6 @@
},
}
- packaging_recipe("ios-usb-dependencies", "")
-
packaging_recipe("flutter", branches.stable.version)
packaging_prod_config(
platform_args,
