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

Commit 58109be

Browse files
[ci] Switch remaining macOS host tests to LUCI
Enables the new LUCI versions of the remaining Cirrus macOS host tests, and removes the Cirrus versions. This completes the macOS LUCI transition for flutter/plugins, leaving only Linux on Cirrus.
1 parent 8f12b27 commit 58109be

File tree

2 files changed

+0
-53
lines changed

2 files changed

+0
-53
lines changed

.ci.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ targets:
8585
channel: stable
8686

8787
- name: Mac_arm64 macos_platform_tests master
88-
bringup: true # New task
8988
recipe: plugins/plugins
9089
timeout: 60
9190
properties:
@@ -95,7 +94,6 @@ targets:
9594
target_file: macos_platform_tests.yaml
9695

9796
- name: Mac_arm64 macos_platform_tests stable
98-
bringup: true # New task
9997
recipe: plugins/plugins
10098
presubmit: false
10199
timeout: 60
@@ -110,7 +108,6 @@ targets:
110108
# once simulator tests are reliable on the ARM infrastructure. See discussion
111109
# at https://github.com/flutter/plugins/pull/5693#issuecomment-1126011089
112110
- name: Mac_arm64 ios_build_all_plugins master
113-
bringup: true # New task
114111
recipe: plugins/plugins
115112
timeout: 30
116113
properties:
@@ -120,7 +117,6 @@ targets:
120117
target_file: ios_build_all_plugins.yaml
121118

122119
- name: Mac_arm64 ios_build_all_plugins stable
123-
bringup: true # New task
124120
recipe: plugins/plugins
125121
timeout: 30
126122
properties:

.cirrus.yml

Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,6 @@ tool_setup_template: &TOOL_SETUP_TEMPLATE
2222
tool_setup_script:
2323
- .ci/scripts/prepare_tool.sh
2424

25-
macos_template: &MACOS_TEMPLATE
26-
# Only one macOS task can run in parallel without credits, so use them for
27-
# PRs on macOS.
28-
use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true'
29-
30-
macos_intel_template: &MACOS_INTEL_TEMPLATE
31-
<< : *MACOS_TEMPLATE
32-
osx_instance:
33-
image: big-sur-xcode-13
34-
35-
macos_arm_template: &MACOS_ARM_TEMPLATE
36-
<< : *MACOS_TEMPLATE
37-
macos_instance:
38-
image: ghcr.io/cirruslabs/macos-ventura-xcode:14
39-
4025
flutter_upgrade_template: &FLUTTER_UPGRADE_TEMPLATE
4126
upgrade_flutter_script:
4227
# Channels that are part of our normal test matrix use a pinned,
@@ -306,37 +291,3 @@ task:
306291
- ./script/tool_runner.sh build-examples --web
307292
drive_script:
308293
- ./script/tool_runner.sh drive-examples --web --exclude=script/configs/exclude_integration_web.yaml
309-
310-
# ARM macOS tasks.
311-
task:
312-
<< : *MACOS_ARM_TEMPLATE
313-
<< : *FLUTTER_UPGRADE_TEMPLATE
314-
matrix:
315-
### iOS tasks ###
316-
- name: ios-build_all_plugins
317-
env:
318-
BUILD_ALL_ARGS: "ios --no-codesign"
319-
matrix:
320-
CHANNEL: "master"
321-
CHANNEL: "stable"
322-
<< : *BUILD_ALL_PLUGINS_APP_TEMPLATE
323-
### macOS desktop tasks ###
324-
- name: macos-platform_tests
325-
# Don't run full platform tests on both channels in pre-submit.
326-
skip: $CIRRUS_PR != '' && $CHANNEL == 'stable'
327-
env:
328-
matrix:
329-
CHANNEL: "master"
330-
CHANNEL: "stable"
331-
PATH: $PATH:/usr/local/bin
332-
build_script:
333-
- ./script/tool_runner.sh build-examples --macos
334-
xcode_analyze_script:
335-
- ./script/tool_runner.sh xcode-analyze --macos
336-
xcode_analyze_deprecation_script:
337-
# Ensure we don't accidentally introduce deprecated code.
338-
- ./script/tool_runner.sh xcode-analyze --macos --macos-min-version=12.3
339-
native_test_script:
340-
- ./script/tool_runner.sh native-test --macos
341-
drive_script:
342-
- ./script/tool_runner.sh drive-examples --macos --exclude=script/configs/exclude_integration_macos.yaml

0 commit comments

Comments
 (0)