Add xcode property for platform mac_arm64_ios
Change-Id: Idaffbb0f7ec780415ae604c047f7ff8ba3a576ef
Bug: https://github.com/flutter/flutter/issues/87508
Reviewed-on: https://flutter-review.googlesource.com/c/infra/+/29261
Reviewed-by: Casey Hillers <chillers@google.com>
Reviewed-by: Xilai Zhang <xilaizhang@google.com>
Reviewed-by: Jenn Magder <magder@google.com>
Reviewed-by: Yusuf Mohsinally <mohsinally@google.com>
Commit-Queue: Keyong Han <keyonghan@google.com>
diff --git a/config/generated/flutter/luci/cr-buildbucket.cfg b/config/generated/flutter/luci/cr-buildbucket.cfg
index b4c24ac..dee444d 100644
--- a/config/generated/flutter/luci/cr-buildbucket.cfg
+++ b/config/generated/flutter/luci/cr-buildbucket.cfg
@@ -63329,6 +63329,9 @@
}
properties:
'{'
+ ' "$flutter/devicelab_osx_sdk": {'
+ ' "sdk_version": "13a233"'
+ ' },'
' "$fuchsia/goma": {'
' "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
' },'
@@ -63435,6 +63438,9 @@
}
properties:
'{'
+ ' "$flutter/devicelab_osx_sdk": {'
+ ' "sdk_version": "13a233"'
+ ' },'
' "$fuchsia/goma": {'
' "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
' },'
@@ -63541,6 +63547,9 @@
}
properties:
'{'
+ ' "$flutter/devicelab_osx_sdk": {'
+ ' "sdk_version": "13a233"'
+ ' },'
' "$fuchsia/goma": {'
' "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
' },'
@@ -63647,6 +63656,9 @@
}
properties:
'{'
+ ' "$flutter/devicelab_osx_sdk": {'
+ ' "sdk_version": "13a233"'
+ ' },'
' "$fuchsia/goma": {'
' "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
' },'
@@ -63753,6 +63765,9 @@
}
properties:
'{'
+ ' "$flutter/devicelab_osx_sdk": {'
+ ' "sdk_version": "13a233"'
+ ' },'
' "$fuchsia/goma": {'
' "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
' },'
@@ -63859,6 +63874,9 @@
}
properties:
'{'
+ ' "$flutter/devicelab_osx_sdk": {'
+ ' "sdk_version": "13a233"'
+ ' },'
' "$fuchsia/goma": {'
' "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
' },'
@@ -63965,6 +63983,9 @@
}
properties:
'{'
+ ' "$flutter/devicelab_osx_sdk": {'
+ ' "sdk_version": "13a233"'
+ ' },'
' "$fuchsia/goma": {'
' "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
' },'
@@ -64071,6 +64092,9 @@
}
properties:
'{'
+ ' "$flutter/devicelab_osx_sdk": {'
+ ' "sdk_version": "13a233"'
+ ' },'
' "$fuchsia/goma": {'
' "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
' },'
@@ -64177,6 +64201,9 @@
}
properties:
'{'
+ ' "$flutter/devicelab_osx_sdk": {'
+ ' "sdk_version": "13a233"'
+ ' },'
' "$fuchsia/goma": {'
' "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
' },'
@@ -155796,6 +155823,9 @@
}
properties:
'{'
+ ' "$flutter/devicelab_osx_sdk": {'
+ ' "sdk_version": "13a233"'
+ ' },'
' "$fuchsia/goma": {'
' "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
' },'
@@ -155903,6 +155933,9 @@
}
properties:
'{'
+ ' "$flutter/devicelab_osx_sdk": {'
+ ' "sdk_version": "13a233"'
+ ' },'
' "$fuchsia/goma": {'
' "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
' },'
@@ -156010,6 +156043,9 @@
}
properties:
'{'
+ ' "$flutter/devicelab_osx_sdk": {'
+ ' "sdk_version": "13a233"'
+ ' },'
' "$fuchsia/goma": {'
' "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
' },'
@@ -156117,6 +156153,9 @@
}
properties:
'{'
+ ' "$flutter/devicelab_osx_sdk": {'
+ ' "sdk_version": "13a233"'
+ ' },'
' "$fuchsia/goma": {'
' "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
' },'
@@ -156224,6 +156263,9 @@
}
properties:
'{'
+ ' "$flutter/devicelab_osx_sdk": {'
+ ' "sdk_version": "13a233"'
+ ' },'
' "$fuchsia/goma": {'
' "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
' },'
@@ -156331,6 +156373,9 @@
}
properties:
'{'
+ ' "$flutter/devicelab_osx_sdk": {'
+ ' "sdk_version": "13a233"'
+ ' },'
' "$fuchsia/goma": {'
' "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
' },'
@@ -156438,6 +156483,9 @@
}
properties:
'{'
+ ' "$flutter/devicelab_osx_sdk": {'
+ ' "sdk_version": "13a233"'
+ ' },'
' "$fuchsia/goma": {'
' "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
' },'
@@ -156545,6 +156593,9 @@
}
properties:
'{'
+ ' "$flutter/devicelab_osx_sdk": {'
+ ' "sdk_version": "13a233"'
+ ' },'
' "$fuchsia/goma": {'
' "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
' },'
@@ -156652,6 +156703,9 @@
}
properties:
'{'
+ ' "$flutter/devicelab_osx_sdk": {'
+ ' "sdk_version": "13a233"'
+ ' },'
' "$fuchsia/goma": {'
' "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
' },'
@@ -209323,6 +209377,9 @@
}
properties:
'{'
+ ' "$flutter/devicelab_osx_sdk": {'
+ ' "sdk_version": "13a233"'
+ ' },'
' "$fuchsia/goma": {'
' "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
' },'
@@ -209427,6 +209484,9 @@
}
properties:
'{'
+ ' "$flutter/devicelab_osx_sdk": {'
+ ' "sdk_version": "13a233"'
+ ' },'
' "$fuchsia/goma": {'
' "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
' },'
@@ -209531,6 +209591,9 @@
}
properties:
'{'
+ ' "$flutter/devicelab_osx_sdk": {'
+ ' "sdk_version": "13a233"'
+ ' },'
' "$fuchsia/goma": {'
' "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
' },'
@@ -209635,6 +209698,9 @@
}
properties:
'{'
+ ' "$flutter/devicelab_osx_sdk": {'
+ ' "sdk_version": "13a233"'
+ ' },'
' "$fuchsia/goma": {'
' "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
' },'
@@ -209739,6 +209805,9 @@
}
properties:
'{'
+ ' "$flutter/devicelab_osx_sdk": {'
+ ' "sdk_version": "13a233"'
+ ' },'
' "$fuchsia/goma": {'
' "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
' },'
@@ -209843,6 +209912,9 @@
}
properties:
'{'
+ ' "$flutter/devicelab_osx_sdk": {'
+ ' "sdk_version": "13a233"'
+ ' },'
' "$fuchsia/goma": {'
' "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
' },'
@@ -209947,6 +210019,9 @@
}
properties:
'{'
+ ' "$flutter/devicelab_osx_sdk": {'
+ ' "sdk_version": "13a233"'
+ ' },'
' "$fuchsia/goma": {'
' "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
' },'
@@ -210051,6 +210126,9 @@
}
properties:
'{'
+ ' "$flutter/devicelab_osx_sdk": {'
+ ' "sdk_version": "13a233"'
+ ' },'
' "$fuchsia/goma": {'
' "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
' },'
@@ -210155,6 +210233,9 @@
}
properties:
'{'
+ ' "$flutter/devicelab_osx_sdk": {'
+ ' "sdk_version": "13a233"'
+ ' },'
' "$fuchsia/goma": {'
' "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
' },'
diff --git a/config/generated/flutter/luci/project.cfg b/config/generated/flutter/luci/project.cfg
index 61da59d..1b70f14 100644
--- a/config/generated/flutter/luci/project.cfg
+++ b/config/generated/flutter/luci/project.cfg
@@ -7,7 +7,7 @@
name: "flutter"
access: "group:all"
lucicfg {
- version: "1.30.11"
+ version: "1.30.10"
package_dir: "../../.."
config_dir: "generated/flutter/luci"
entry_point: "main.star"
diff --git a/config/lib/ci_yaml/ci_yaml.star b/config/lib/ci_yaml/ci_yaml.star
index 37c2d9e..b7a1a8f 100644
--- a/config/lib/ci_yaml/ci_yaml.star
+++ b/config/lib/ci_yaml/ci_yaml.star
@@ -178,7 +178,7 @@
properties[k] = v
# Special case to pass xcode for engine
- for xcode_platform in ["mac", "mac_ios", "mac_ios32"]:
+ for xcode_platform in ["mac", "mac_ios", "mac_arm64_ios"]:
if platform != xcode_platform:
continue
if "xcode" not in properties:
@@ -188,7 +188,7 @@
}
# DeviceLab bots are on a slower lab network. We avoid LUCI caches on those bots
- if platform in ["mac_ios", "mac_ios32"]:
+ if platform in ["mac_ios", "mac_arm64_ios"]:
properties["$flutter/devicelab_osx_sdk"] = xcode_version
else:
properties["$flutter/osx_sdk"] = xcode_version
