1
0
mirror of https://github.com/flutter/packages.git synced 2025-07-23 10:06:14 +08:00

[ci] Switch more macOS tests to LUCI ()

* [ci] Switch more macOS tests to LUCI

Enables the newly-added LUCI versions of the remaining macOS host tests
(other than custom-tests, which still has issues that are under
investigation) and removes the Cirrus versions of those tests. This
almost completes the macOS LUCI migration for this repository.

* Simplify remaining Cirrus config

* Rename scripts

* Remove reference to config that doesn't exist in this repo yet
This commit is contained in:
stuartmorgan
2023-01-31 10:13:17 -08:00
committed by GitHub
parent bf999955aa
commit f9037e4e29
6 changed files with 7 additions and 73 deletions

@ -67,7 +67,6 @@ targets:
channel: stable
- name: Mac_arm64 ios_platform_tests_shard_1 master
bringup: true # New task
recipe: packages/packages
timeout: 60
properties:
@ -77,7 +76,6 @@ targets:
package_sharding: "--shardIndex 0 --shardCount 5"
- name: Mac_arm64 ios_platform_tests_shard_2 master
bringup: true # New task
recipe: packages/packages
timeout: 60
properties:
@ -87,7 +85,6 @@ targets:
package_sharding: "--shardIndex 1 --shardCount 5"
- name: Mac_arm64 ios_platform_tests_shard_3 master
bringup: true # New task
recipe: packages/packages
timeout: 60
properties:
@ -97,7 +94,6 @@ targets:
package_sharding: "--shardIndex 2 --shardCount 5"
- name: Mac_arm64 ios_platform_tests_shard_4 master
bringup: true # New task
recipe: packages/packages
timeout: 60
properties:
@ -107,7 +103,6 @@ targets:
package_sharding: "--shardIndex 3 --shardCount 5"
- name: Mac_arm64 ios_platform_tests_shard_5 master
bringup: true # New task
recipe: packages/packages
timeout: 60
properties:
@ -118,7 +113,6 @@ targets:
# Don't run full platform tests on both channels in pre-submit.
- name: Mac_arm64 ios_platform_tests_shard_1 stable
bringup: true # New task
recipe: packages/packages
presubmit: false
timeout: 60
@ -130,7 +124,6 @@ targets:
package_sharding: "--shardIndex 0 --shardCount 5"
- name: Mac_arm64 ios_platform_tests_shard_2 stable
bringup: true # New task
recipe: packages/packages
presubmit: false
timeout: 60
@ -142,7 +135,6 @@ targets:
package_sharding: "--shardIndex 1 --shardCount 5"
- name: Mac_arm64 ios_platform_tests_shard_3 stable
bringup: true # New task
recipe: packages/packages
presubmit: false
timeout: 60
@ -154,7 +146,6 @@ targets:
package_sharding: "--shardIndex 2 --shardCount 5"
- name: Mac_arm64 ios_platform_tests_shard_4 stable
bringup: true # New task
recipe: packages/packages
presubmit: false
timeout: 60
@ -166,7 +157,6 @@ targets:
package_sharding: "--shardIndex 3 --shardCount 5"
- name: Mac_arm64 ios_platform_tests_shard_5 stable
bringup: true # New task
recipe: packages/packages
presubmit: false
timeout: 60
@ -186,7 +176,7 @@ targets:
properties:
add_recipes_cq: "true"
version_file: flutter_master.version
target_file: mac_build_all_packages.yaml
target_file: macos_build_all_packages.yaml
channel: master
- name: Mac_x64 build_all_packages stable
@ -195,14 +185,13 @@ targets:
properties:
add_recipes_cq: "true"
version_file: flutter_stable.version
target_file: mac_build_all_packages.yaml
target_file: macos_build_all_packages.yaml
channel: stable
# TODO(stuartmorgan): Remove "- packages" from all task names once
# flutter/plugins is merged into this repo and turned down; it's here only
# because names must be unique across all flutter repositories.
- name: Mac_arm64 macos_platform_tests master - packages
bringup: true # New task
recipe: packages/packages
timeout: 60
properties:
@ -212,7 +201,6 @@ targets:
target_file: macos_platform_tests.yaml
- name: Mac_arm64 macos_platform_tests stable - packages
bringup: true # New task
recipe: packages/packages
presubmit: false
timeout: 60
@ -229,7 +217,7 @@ targets:
properties:
add_recipes_cq: "true"
version_file: flutter_master.version
target_file: mac_custom_package_tests.yaml
target_file: macos_custom_package_tests.yaml
channel: master
- name: Mac_arm64 custom_package_tests stable
@ -239,7 +227,7 @@ targets:
properties:
add_recipes_cq: "true"
version_file: flutter_stable.version
target_file: mac_custom_package_tests.yaml
target_file: macos_custom_package_tests.yaml
channel: stable
### Windows desktop tasks ###

@ -21,4 +21,4 @@ tasks:
# This UI change sometimes affects `xctest`.
# So we run `drive-examples` after `native-test`; changing the order will result ci failure.
script: script/tool_runner.sh
args: ["drive-examples", "--ios", "--exclude=script/configs/exclude_integration_ios.yaml"]
args: ["drive-examples", "--ios"]

@ -26,14 +26,6 @@ macos_template: &MACOS_TEMPLATE
# Only one macOS task can run in parallel without credits, so use them for
# PRs on macOS.
use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true'
macos_intel_template: &MACOS_INTEL_TEMPLATE
<< : *MACOS_TEMPLATE
osx_instance:
image: big-sur-xcode-13
macos_arm_template: &MACOS_ARM_TEMPLATE
<< : *MACOS_TEMPLATE
macos_instance:
image: ghcr.io/cirruslabs/macos-ventura-xcode:14
@ -317,10 +309,10 @@ task:
- ./script/tool_runner.sh make-deps-path-based --target-dependencies-with-non-breaking-updates
- $PLUGIN_TOOL_COMMAND test --run-on-dirty-packages --exclude=script/configs/dart_unit_tests_exceptions.yaml
# ARM macOS tasks.
# macOS tasks.
task:
<< : *FLUTTER_UPGRADE_TEMPLATE
<< : *MACOS_ARM_TEMPLATE
<< : *MACOS_TEMPLATE
matrix:
- name: macos-custom_package_tests
env:
@ -332,49 +324,3 @@ task:
# script/configs/linux_only_custom_test.yaml
# Custom tests need Chrome for these packages. (They run in linux-custom_package_tests)
- ./script/tool_runner.sh custom-test --exclude=script/configs/linux_only_custom_test.yaml
### iOS tasks ###
- 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:
CHANNEL: "master"
CHANNEL: "stable"
create_simulator_script:
- xcrun simctl list
- xcrun simctl create Flutter-iPhone com.apple.CoreSimulator.SimDeviceType.iPhone-13 com.apple.CoreSimulator.SimRuntime.iOS-16-0 | xargs xcrun simctl boot
build_script:
- ./script/tool_runner.sh build-examples --ios
native_test_script:
- ./script/tool_runner.sh native-test --ios --ios-destination "platform=iOS Simulator,name=iPhone 13,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
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
### macOS desktop tasks ###
- name: macos-platform_tests
# Don't run full platform tests on both channels in pre-submit.
skip: $CIRRUS_PR != '' && $CHANNEL == 'stable'
env:
matrix:
CHANNEL: "master"
CHANNEL: "stable"
PATH: $PATH:/usr/local/bin
build_script:
- ./script/tool_runner.sh build-examples --macos
xcode_analyze_script:
- ./script/tool_runner.sh xcode-analyze --macos
xcode_analyze_deprecation_script:
# Ensure we don't accidentally introduce deprecated code.
- ./script/tool_runner.sh xcode-analyze --macos --macos-min-version=12.3
native_test_script:
- ./script/tool_runner.sh native-test --macos
drive_script:
- ./script/tool_runner.sh drive-examples --macos