Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Run tests on either macOS 12 or 13 #47606

Merged
merged 1 commit into from
Nov 2, 2023
Merged

Run tests on either macOS 12 or 13 #47606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ platform_properties:
]
device_type: none
cpu: x86
os: Mac-12
os: Mac-12|Mac-13
$flutter/osx_sdk : >-
{
"sdk_version": "14e300c"
Expand Down Expand Up @@ -448,7 +448,7 @@ targets:
"sdk_version": "14e300c"
}
drone_dimensions:
- os=Mac-12
- os=Mac-12|Mac-13

- name: Linux mac_unopt
recipe: engine_v2/engine_v2
Expand All @@ -469,7 +469,7 @@ targets:
"sdk_version": "14e300c"
}
drone_dimensions:
- os=Mac-12
- os=Mac-12|Mac-13
- cpu=x86

- name: Mac impeller-cmake-example
Expand Down
12 changes: 6 additions & 6 deletions ci/builders/mac_android_aot_engine.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"os=Mac-12|Mac-13",
"cpu=x86"
],
"gclient_variables": {
Expand Down Expand Up @@ -53,7 +53,7 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"os=Mac-12|Mac-13",
"cpu=x86"
],
"gclient_variables": {
Expand Down Expand Up @@ -93,7 +93,7 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"os=Mac-12|Mac-13",
"cpu=x86"
],
"gclient_variables": {
Expand Down Expand Up @@ -133,7 +133,7 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"os=Mac-12|Mac-13",
"cpu=x86"
],
"gclient_variables": {
Expand Down Expand Up @@ -172,7 +172,7 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"os=Mac-12|Mac-13",
"cpu=x86"
],
"gclient_variables": {
Expand Down Expand Up @@ -212,7 +212,7 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"os=Mac-12|Mac-13",
"cpu=x86"
],
"gclient_variables": {
Expand Down
14 changes: 7 additions & 7 deletions ci/builders/mac_clang_tidy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"os=Mac-12|Mac-13",
"cpu=arm64"
],
"gclient_variables": {
Expand All @@ -24,7 +24,7 @@
{
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"os=Mac-12|Mac-13",
"cpu=arm64"
],
"gclient_variables": {
Expand All @@ -50,7 +50,7 @@
"recipe": "engine_v2/tester_engine",
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"os=Mac-12|Mac-13",
"cpu=arm64"
],
"gclient_variables": {
Expand Down Expand Up @@ -82,7 +82,7 @@
"recipe": "engine_v2/tester_engine",
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"os=Mac-12|Mac-13",
"cpu=arm64"
],
"gclient_variables": {
Expand Down Expand Up @@ -114,7 +114,7 @@
"recipe": "engine_v2/tester_engine",
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"os=Mac-12|Mac-13",
"cpu=arm64"
],
"gclient_variables": {
Expand Down Expand Up @@ -146,7 +146,7 @@
"recipe": "engine_v2/tester_engine",
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"os=Mac-12|Mac-13",
"cpu=arm64"
],
"gclient_variables": {
Expand Down Expand Up @@ -178,7 +178,7 @@
"recipe": "engine_v2/tester_engine",
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"os=Mac-12|Mac-13",
"cpu=arm64"
],
"gclient_variables": {
Expand Down
8 changes: 4 additions & 4 deletions ci/builders/mac_clang_tidy_presubmit.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"os=Mac-12|Mac-13",
"cpu=arm64"
],
"gclient_variables": {
Expand All @@ -24,7 +24,7 @@
{
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"os=Mac-12|Mac-13",
"cpu=arm64"
],
"gclient_variables": {
Expand All @@ -50,7 +50,7 @@
"recipe": "engine_v2/tester_engine",
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"os=Mac-12|Mac-13",
"cpu=arm64"
],
"gclient_variables": {
Expand Down Expand Up @@ -82,7 +82,7 @@
"recipe": "engine_v2/tester_engine",
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"os=Mac-12|Mac-13",
"cpu=arm64"
],
"gclient_variables": {
Expand Down
12 changes: 6 additions & 6 deletions ci/builders/mac_host_engine.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"os=Mac-12|Mac-13",
"cpu=x86",
"mac_model=Macmini8,1"
],
Expand Down Expand Up @@ -79,7 +79,7 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"os=Mac-12|Mac-13",
"cpu=x86",
"mac_model=Macmini8,1"
],
Expand Down Expand Up @@ -139,7 +139,7 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"os=Mac-12|Mac-13",
"cpu=x86",
"mac_model=Macmini8,1"
],
Expand Down Expand Up @@ -208,7 +208,7 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"os=Mac-12|Mac-13",
"cpu=x86"
],
"gclient_variables": {
Expand Down Expand Up @@ -255,7 +255,7 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"os=Mac-12|Mac-13",
"cpu=x86"
],
"gclient_variables": {
Expand Down Expand Up @@ -299,7 +299,7 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"os=Mac-12|Mac-13",
"cpu=x86"
],
"gclient_variables": {
Expand Down
2 changes: 1 addition & 1 deletion ci/builders/mac_impeller_cmake_example.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"archives": [],
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"os=Mac-12|Mac-13",
"cpu=arm64"
],
"gclient_variables": {
Expand Down
20 changes: 10 additions & 10 deletions ci/builders/mac_ios_engine.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"os=Mac-12|Mac-13",
"cpu=x86"
],
"gn": [
Expand All @@ -26,7 +26,7 @@
{
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"os=Mac-12|Mac-13",
"cpu=x86"
],
"gn": [
Expand All @@ -50,7 +50,7 @@
{
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"os=Mac-12|Mac-13",
"cpu=x86"
],
"gn": [
Expand All @@ -74,7 +74,7 @@
{
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"os=Mac-12|Mac-13",
"cpu=x86"
],
"gn": [
Expand All @@ -99,7 +99,7 @@
{
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"os=Mac-12|Mac-13",
"cpu=x86"
],
"gn": [
Expand All @@ -124,7 +124,7 @@
{
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"os=Mac-12|Mac-13",
"cpu=x86"
],
"gn": [
Expand All @@ -148,7 +148,7 @@
{
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"os=Mac-12|Mac-13",
"cpu=x86"
],
"gn": [
Expand All @@ -173,7 +173,7 @@
{
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"os=Mac-12|Mac-13",
"cpu=x86"
],
"gn": [
Expand All @@ -198,7 +198,7 @@
{
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"os=Mac-12|Mac-13",
"cpu=x86"
],
"gn": [
Expand All @@ -224,7 +224,7 @@
{
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"os=Mac-12|Mac-13",
"cpu=x86"
],
"gn": [
Expand Down
10 changes: 5 additions & 5 deletions ci/builders/mac_unopt.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"os=Mac-12|Mac-13",
"cpu=x86",
"mac_model=Macmini8,1"
],
Expand Down Expand Up @@ -71,7 +71,7 @@
},
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"os=Mac-12|Mac-13",
"cpu=x86"
],
"gclient_variables": {
Expand Down Expand Up @@ -128,7 +128,7 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"os=Mac-12|Mac-13",
"cpu=arm64"
],
"gclient_variables": {
Expand Down Expand Up @@ -177,7 +177,7 @@
},
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"os=Mac-12|Mac-13",
"cpu=arm64"
],
"gclient_variables": {
Expand Down Expand Up @@ -247,7 +247,7 @@
},
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"os=Mac-12|Mac-13",
"cpu=arm64"
],
"gclient_variables": {
Expand Down