diff --git a/.ci.yaml b/.ci.yaml index 5c2e49d752a1..c77aa42c2af1 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -78,7 +78,6 @@ targets: # https://github.com/flutter/plugins/pull/5693#issuecomment-1126011089 - name: Mac_x64 ios_platform_tests_1_of_4 master recipe: plugins/plugins - bringup: true # New target: https://github.com/flutter/plugins/pull/6682 timeout: 30 properties: add_recipes_cq: "true" @@ -88,7 +87,6 @@ targets: - name: Mac_x64 ios_platform_tests_2_of_4 master recipe: plugins/plugins - bringup: true # New target: https://github.com/flutter/plugins/pull/6682 timeout: 30 properties: add_recipes_cq: "true" @@ -98,7 +96,6 @@ targets: - name: Mac_x64 ios_platform_tests_3_of_4 master recipe: plugins/plugins - bringup: true # New target: https://github.com/flutter/plugins/pull/6682 timeout: 30 properties: add_recipes_cq: "true" @@ -108,7 +105,6 @@ targets: - name: Mac_x64 ios_platform_tests_4_of_4 master recipe: plugins/plugins - bringup: true # New target: https://github.com/flutter/plugins/pull/6682 timeout: 30 properties: add_recipes_cq: "true" @@ -120,7 +116,6 @@ targets: - name: Mac_x64 ios_platform_tests_1_of_4 stable recipe: plugins/plugins presubmit: false - bringup: true # New target: https://github.com/flutter/plugins/pull/6682 timeout: 30 properties: channel: stable @@ -132,7 +127,6 @@ targets: - name: Mac_x64 ios_platform_tests_2_of_4 stable recipe: plugins/plugins presubmit: false - bringup: true # New target: https://github.com/flutter/plugins/pull/6682 timeout: 30 properties: channel: stable @@ -144,7 +138,6 @@ targets: - name: Mac_x64 ios_platform_tests_3_of_4 stable recipe: plugins/plugins presubmit: false - bringup: true # New target: https://github.com/flutter/plugins/pull/6682 timeout: 30 properties: channel: stable @@ -156,7 +149,6 @@ targets: - name: Mac_x64 ios_platform_tests_4_of_4 stable recipe: plugins/plugins presubmit: false - bringup: true # New target: https://github.com/flutter/plugins/pull/6682 timeout: 30 properties: channel: stable diff --git a/.cirrus.yml b/.cirrus.yml index 5f17dc96e340..f0e605426e4f 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -332,44 +332,3 @@ task: - ./script/tool_runner.sh native-test --macos drive_script: - ./script/tool_runner.sh drive-examples --macos --exclude=script/configs/exclude_integration_macos.yaml - -# Intel macOS tasks. -task: - << : *MACOS_INTEL_TEMPLATE - << : *FLUTTER_UPGRADE_TEMPLATE - matrix: - ### iOS tasks ### - # TODO(stuartmorgan): Swap this and ios-build_all_plugins once simulator - # tests are reliable on the ARM infrastructure. See discussion at - # https://github.com/flutter/plugins/pull/5693#issuecomment-1126011089 - - name: ios-platform_tests - # Don't run full platform tests on both channels in pre-submit. - skip: $CIRRUS_PR != '' && $CHANNEL == 'stable' - env: - PATH: $PATH:/usr/local/bin - matrix: - PACKAGE_SHARDING: "--shardIndex 0 --shardCount 4" - PACKAGE_SHARDING: "--shardIndex 1 --shardCount 4" - PACKAGE_SHARDING: "--shardIndex 2 --shardCount 4" - PACKAGE_SHARDING: "--shardIndex 3 --shardCount 4" - matrix: - CHANNEL: "master" - CHANNEL: "stable" - SIMCTL_CHILD_MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550] - create_simulator_script: - - xcrun simctl list - - xcrun simctl create Flutter-iPhone com.apple.CoreSimulator.SimDeviceType.iPhone-11 com.apple.CoreSimulator.SimRuntime.iOS-15-0 | xargs xcrun simctl boot - build_script: - - ./script/tool_runner.sh build-examples --ios - xcode_analyze_script: - - ./script/tool_runner.sh xcode-analyze --ios - xcode_analyze_deprecation_script: - # Ensure we don't accidentally introduce deprecated code. - - ./script/tool_runner.sh xcode-analyze --ios --ios-min-version=13.0 - native_test_script: - - ./script/tool_runner.sh native-test --ios --ios-destination "platform=iOS Simulator,name=iPhone 11,OS=latest" - drive_script: - # `drive-examples` contains integration tests, which changes the UI of the application. - # This UI change sometimes affects `xctest`. - # So we run `drive-examples` after `native-test`; changing the order will result ci failure. - - ./script/tool_runner.sh drive-examples --ios --exclude=script/configs/exclude_integration_ios.yaml