From 80d2874e57fb4dfc318fdfd731194402836cd465 Mon Sep 17 00:00:00 2001 From: Elijah Okoroh Date: Thu, 30 Oct 2025 12:37:41 -0700 Subject: [PATCH 1/7] Run tests on macOS 15.5 or 15.7 --- .ci.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci.yaml b/.ci.yaml index f22cd9b83e8..114fec8f9c7 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -93,7 +93,7 @@ platform_properties: [ {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"} ] - os: Mac-14|Mac-15.5 + os: Mac-15.5|Mac-15.7 device_type: none cpu: arm64 $flutter/osx_sdk : >- @@ -106,7 +106,7 @@ platform_properties: [ {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"} ] - os: Mac-14|Mac-15.5 + os: Mac-15.5|Mac-15.7 device_type: none cpu: x86 $flutter/osx_sdk : >- From 4c5d2a5b27f86d0e9cfdd549bc1062ec8c1285b5 Mon Sep 17 00:00:00 2001 From: Elijah Okoroh Date: Tue, 16 Dec 2025 06:05:19 -0800 Subject: [PATCH 2/7] [pr-fix] Run all flutter/packages macOS tests using Xcode 26 and iOS 26 simulator --- .ci.yaml | 14 ++++---------- .ci/scripts/create_simulator.sh | 2 +- .ci/targets/ios_platform_tests.yaml | 2 +- packages/pigeon/tool/shared/test_suites.dart | 2 +- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/.ci.yaml b/.ci.yaml index 35d4b2ec200..2f7cbc12753 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -95,12 +95,12 @@ platform_properties: [ {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"} ] - os: Mac-15.5|Mac-15.7 + os: Mac-15.7 device_type: none cpu: arm64 $flutter/osx_sdk : >- { - "sdk_version": "16c5032a" + "sdk_version": "17a400" } mac_x64: properties: @@ -108,12 +108,12 @@ platform_properties: [ {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"} ] - os: Mac-15.5|Mac-15.7 + os: Mac-15.7 device_type: none cpu: x86 $flutter/osx_sdk : >- { - "sdk_version": "16c5032a" + "sdk_version": "17a400" } targets: @@ -1086,7 +1086,6 @@ targets: - name: Mac_arm64 macos_platform_tests stable - packages recipe: packages/packages - presubmit: false timeout: 60 properties: channel: stable @@ -1222,7 +1221,6 @@ targets: # Don't run full platform tests on both channels in pre-submit. - name: Mac_arm64 ios_platform_tests_shard_1 stable recipe: packages/packages - presubmit: false timeout: 60 properties: channel: stable @@ -1237,7 +1235,6 @@ targets: - name: Mac_arm64 ios_platform_tests_shard_2 stable recipe: packages/packages - presubmit: false timeout: 60 properties: channel: stable @@ -1252,7 +1249,6 @@ targets: - name: Mac_arm64 ios_platform_tests_shard_3 stable recipe: packages/packages - presubmit: false timeout: 60 properties: channel: stable @@ -1267,7 +1263,6 @@ targets: - name: Mac_arm64 ios_platform_tests_shard_4 stable recipe: packages/packages - presubmit: false timeout: 60 properties: channel: stable @@ -1282,7 +1277,6 @@ targets: - name: Mac_arm64 ios_platform_tests_shard_5 stable recipe: packages/packages - presubmit: false timeout: 60 properties: channel: stable diff --git a/.ci/scripts/create_simulator.sh b/.ci/scripts/create_simulator.sh index a993f470f37..165de7264bb 100755 --- a/.ci/scripts/create_simulator.sh +++ b/.ci/scripts/create_simulator.sh @@ -9,7 +9,7 @@ set -o pipefail # The name here must match remove_simulator.sh readonly DEVICE_NAME=Flutter-iPhone readonly DEVICE=com.apple.CoreSimulator.SimDeviceType.iPhone-14 -readonly OS=com.apple.CoreSimulator.SimRuntime.iOS-18-2 +readonly OS=com.apple.CoreSimulator.SimRuntime.iOS-26-0 # Delete any existing devices named Flutter-iPhone. Having more than one may # cause issues when builds target the device. diff --git a/.ci/targets/ios_platform_tests.yaml b/.ci/targets/ios_platform_tests.yaml index 262de31fb93..dfa8e67af75 100644 --- a/.ci/targets/ios_platform_tests.yaml +++ b/.ci/targets/ios_platform_tests.yaml @@ -22,7 +22,7 @@ tasks: - name: native test script: .ci/scripts/tool_runner.sh # Simulator name and version must match name and version in create_simulator.sh - args: ["native-test", "--ios", "--ios-destination", "platform=iOS Simulator,name=Flutter-iPhone,OS=18.2", "--xcode-warnings-exceptions=script/configs/xcode_warnings_exceptions.yaml"] + args: ["native-test", "--ios", "--ios-destination", "platform=iOS Simulator,name=Flutter-iPhone,OS=26.0", "--xcode-warnings-exceptions=script/configs/xcode_warnings_exceptions.yaml"] - name: boot simulator # Ensure simulator is still booted script: .ci/scripts/boot_simulator.sh diff --git a/packages/pigeon/tool/shared/test_suites.dart b/packages/pigeon/tool/shared/test_suites.dart index fe86925792a..8cce1bba6a1 100644 --- a/packages/pigeon/tool/shared/test_suites.dart +++ b/packages/pigeon/tool/shared/test_suites.dart @@ -359,7 +359,7 @@ Future _runIOSPluginUnitTests(String testPluginPath) async { const deviceName = 'Pigeon-Test-iPhone'; const deviceType = 'com.apple.CoreSimulator.SimDeviceType.iPhone-14'; - const deviceRuntime = 'com.apple.CoreSimulator.SimRuntime.iOS-18-2'; + const deviceRuntime = 'com.apple.CoreSimulator.SimRuntime.iOS-26-0'; const deviceOS = '18.2'; await _createSimulator(deviceName, deviceType, deviceRuntime); return runXcodeBuild( From 40d488c34cb85457afde7ec73ba03c5269fe6685 Mon Sep 17 00:00:00 2001 From: Elijah Okoroh Date: Wed, 17 Dec 2025 19:28:58 -0800 Subject: [PATCH 3/7] update version --- packages/pigeon/tool/shared/test_suites.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pigeon/tool/shared/test_suites.dart b/packages/pigeon/tool/shared/test_suites.dart index 8cce1bba6a1..b0710d97165 100644 --- a/packages/pigeon/tool/shared/test_suites.dart +++ b/packages/pigeon/tool/shared/test_suites.dart @@ -360,7 +360,7 @@ Future _runIOSPluginUnitTests(String testPluginPath) async { const deviceName = 'Pigeon-Test-iPhone'; const deviceType = 'com.apple.CoreSimulator.SimDeviceType.iPhone-14'; const deviceRuntime = 'com.apple.CoreSimulator.SimRuntime.iOS-26-0'; - const deviceOS = '18.2'; + const deviceOS = '26.0'; await _createSimulator(deviceName, deviceType, deviceRuntime); return runXcodeBuild( '$examplePath/ios', From 89871970ac3ced9e035b0212c9e806b8fc86451d Mon Sep 17 00:00:00 2001 From: Elijah Okoroh Date: Thu, 18 Dec 2025 15:11:57 -0800 Subject: [PATCH 4/7] try xcode 26.1 release --- .ci.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci.yaml b/.ci.yaml index 2f7cbc12753..90213997fea 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -100,7 +100,7 @@ platform_properties: cpu: arm64 $flutter/osx_sdk : >- { - "sdk_version": "17a400" + "sdk_version": "17B55" } mac_x64: properties: @@ -113,7 +113,7 @@ platform_properties: cpu: x86 $flutter/osx_sdk : >- { - "sdk_version": "17a400" + "sdk_version": "17B55" } targets: From add172fc280cd656875e585b8249d620c2774a5a Mon Sep 17 00:00:00 2001 From: Elijah Okoroh Date: Thu, 18 Dec 2025 15:18:33 -0800 Subject: [PATCH 5/7] try 26.2 --- .ci.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci.yaml b/.ci.yaml index 90213997fea..e6da940356f 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -100,7 +100,7 @@ platform_properties: cpu: arm64 $flutter/osx_sdk : >- { - "sdk_version": "17B55" + "sdk_version": "17c52" } mac_x64: properties: @@ -113,7 +113,7 @@ platform_properties: cpu: x86 $flutter/osx_sdk : >- { - "sdk_version": "17B55" + "sdk_version": "17c52" } targets: From 72dac264c1a49b97cdb2843db0b693e62f22e6de Mon Sep 17 00:00:00 2001 From: Elijah Okoroh Date: Thu, 18 Dec 2025 15:30:27 -0800 Subject: [PATCH 6/7] try 26.2 --- .ci/scripts/create_simulator.sh | 2 +- .ci/targets/ios_platform_tests.yaml | 2 +- packages/pigeon/tool/shared/test_suites.dart | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.ci/scripts/create_simulator.sh b/.ci/scripts/create_simulator.sh index 165de7264bb..e4310026600 100755 --- a/.ci/scripts/create_simulator.sh +++ b/.ci/scripts/create_simulator.sh @@ -9,7 +9,7 @@ set -o pipefail # The name here must match remove_simulator.sh readonly DEVICE_NAME=Flutter-iPhone readonly DEVICE=com.apple.CoreSimulator.SimDeviceType.iPhone-14 -readonly OS=com.apple.CoreSimulator.SimRuntime.iOS-26-0 +readonly OS=com.apple.CoreSimulator.SimRuntime.iOS-26-2 # Delete any existing devices named Flutter-iPhone. Having more than one may # cause issues when builds target the device. diff --git a/.ci/targets/ios_platform_tests.yaml b/.ci/targets/ios_platform_tests.yaml index dfa8e67af75..4a8a45374e5 100644 --- a/.ci/targets/ios_platform_tests.yaml +++ b/.ci/targets/ios_platform_tests.yaml @@ -22,7 +22,7 @@ tasks: - name: native test script: .ci/scripts/tool_runner.sh # Simulator name and version must match name and version in create_simulator.sh - args: ["native-test", "--ios", "--ios-destination", "platform=iOS Simulator,name=Flutter-iPhone,OS=26.0", "--xcode-warnings-exceptions=script/configs/xcode_warnings_exceptions.yaml"] + args: ["native-test", "--ios", "--ios-destination", "platform=iOS Simulator,name=Flutter-iPhone,OS=26.2", "--xcode-warnings-exceptions=script/configs/xcode_warnings_exceptions.yaml"] - name: boot simulator # Ensure simulator is still booted script: .ci/scripts/boot_simulator.sh diff --git a/packages/pigeon/tool/shared/test_suites.dart b/packages/pigeon/tool/shared/test_suites.dart index b0710d97165..993f276ecd3 100644 --- a/packages/pigeon/tool/shared/test_suites.dart +++ b/packages/pigeon/tool/shared/test_suites.dart @@ -359,8 +359,8 @@ Future _runIOSPluginUnitTests(String testPluginPath) async { const deviceName = 'Pigeon-Test-iPhone'; const deviceType = 'com.apple.CoreSimulator.SimDeviceType.iPhone-14'; - const deviceRuntime = 'com.apple.CoreSimulator.SimRuntime.iOS-26-0'; - const deviceOS = '26.0'; + const deviceRuntime = 'com.apple.CoreSimulator.SimRuntime.iOS-26-2'; + const deviceOS = '26.2'; await _createSimulator(deviceName, deviceType, deviceRuntime); return runXcodeBuild( '$examplePath/ios', From 726e9beb833c35b3bfe3985f9f2552b26b3e7e74 Mon Sep 17 00:00:00 2001 From: Elijah Okoroh Date: Fri, 19 Dec 2025 12:19:40 -0800 Subject: [PATCH 7/7] use arm64 --- .ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci.yaml b/.ci.yaml index e6da940356f..2761467cd78 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -110,7 +110,7 @@ platform_properties: ] os: Mac-15.7 device_type: none - cpu: x86 + cpu: arm64 $flutter/osx_sdk : >- { "sdk_version": "17c52"