Run Mac hostonly tests on any available arch (#109889)
diff --git a/.ci.yaml b/.ci.yaml
index 37e0c0b..cf69c86 100644
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -76,6 +76,21 @@
[]
os: Mac-12
device_type: none
+ xcode: 14a5294e # xcode 14.0 beta 5
+ mac_arm64:
+ properties:
+ dependencies: >-
+ []
+ os: Mac-12
+ device_type: none
+ cpu: arm64
+ xcode: 14a5294e # xcode 14.0 beta 5
+ mac_x64:
+ properties:
+ dependencies: >-
+ []
+ os: Mac-12
+ device_type: none
cpu: x86
xcode: 14a5294e # xcode 14.0 beta 5
mac_android:
@@ -2341,6 +2356,7 @@
timeout: 60
properties:
add_recipes_cq: "true"
+ cpu: x86 # https://github.com/flutter/flutter/issues/110113
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:33v6"},
@@ -2360,6 +2376,7 @@
timeout: 60
properties:
add_recipes_cq: "true"
+ cpu: x86 # https://github.com/flutter/flutter/issues/110113
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:33v6"},
@@ -2379,6 +2396,7 @@
timeout: 60
properties:
add_recipes_cq: "true"
+ cpu: x86 # https://github.com/flutter/flutter/issues/110113
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:33v6"},
@@ -2398,6 +2416,7 @@
timeout: 60
properties:
add_recipes_cq: "true"
+ cpu: x86 # https://github.com/flutter/flutter/issues/110113
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:33v6"},
@@ -2680,6 +2699,7 @@
recipe: devicelab/devicelab_drone
timeout: 60
properties:
+ cpu: x86 # Codesigning fails on ARM https://github.com/flutter/flutter/issues/112033
dependencies: >-
[
{"dependency": "xcode", "version": "14a5294e"},
@@ -2765,10 +2785,6 @@
presubmit: false
timeout: 60
properties:
- dependencies: >-
- [
- {"dependency": "arm64ruby", "version": "version:311_3"}
- ]
tags: >
["devicelab", "ios", "mac", "arm64"]
task_name: plugin_lint_mac
@@ -2815,7 +2831,8 @@
- bin/**
- .ci.yaml
- - name: Mac tool_host_cross_arch_tests
+ - name: Mac_x64 tool_host_cross_arch_tests
+ bringup: true # Mac_x64 variant https://github.com/flutter/flutter/pull/109889
recipe: flutter/flutter_drone
timeout: 60
properties:
@@ -2835,11 +2852,34 @@
- bin/**
- .ci.yaml
+ - name: Mac_arm64 tool_host_cross_arch_tests
+ bringup: true # Mac_arm64 variant https://github.com/flutter/flutter/pull/109889
+ recipe: flutter/flutter_drone
+ timeout: 60
+ properties:
+ add_recipes_cq: "true"
+ cpu: arm64
+ dependencies: >-
+ [
+ {"dependency": "xcode", "version": "14a5294e"},
+ {"dependency": "gems", "version": "v3.3.14"}
+ ]
+ shard: tool_host_cross_arch_tests
+ tags: >
+ ["framework", "hostonly", "shard"]
+ test_timeout_secs: "2700"
+ runIf:
+ - dev/**
+ - packages/flutter_tools/**
+ - bin/**
+ - .ci.yaml
+
- name: Mac tool_integration_tests_1_4
recipe: flutter/flutter_drone
timeout: 60
properties:
add_recipes_cq: "true"
+ cpu: x86 # https://github.com/flutter/flutter/issues/110113
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:33v6"},
@@ -2865,6 +2905,7 @@
timeout: 60
properties:
add_recipes_cq: "true"
+ cpu: x86 # https://github.com/flutter/flutter/issues/110113
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:33v6"},
@@ -2890,6 +2931,7 @@
timeout: 60
properties:
add_recipes_cq: "true"
+ cpu: x86 # https://github.com/flutter/flutter/issues/110113
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:33v6"},
@@ -2915,6 +2957,7 @@
timeout: 60
properties:
add_recipes_cq: "true"
+ cpu: x86 # https://github.com/flutter/flutter/issues/110113
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:33v6"},
@@ -2992,6 +3035,7 @@
recipe: flutter/flutter_drone
timeout: 60
properties:
+ cpu: x86 # https://github.com/flutter/flutter/issues/110113
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:33v6"},
