[go: nahoru, domu]

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

[ci] Add LUCI versions of macOS ARM tests #6984

Merged
merged 8 commits into from
Jan 30, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Next Next commit
[ci] Add an initial macOS ARM LUCI test
Adds a macOS arm64 configuration, and adds the iOS build-all test in
bringup mode to begin testing a LUCI migration for the ARM tests in this
repository.
  • Loading branch information
stuartmorgan committed Jan 17, 2023
commit 354f2701e4d649b7f9e22756423528a0f475f864
38 changes: 36 additions & 2 deletions .ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,17 @@ platform_properties:
]
device_type: none
os: Windows
mac_arm64:
properties:
dependencies: >-
[
{"dependency": "xcode", "version": "14a5294e"},
{"dependency": "gems", "version": "v3.3.14"}
]
os: Mac-12
device_type: none
cpu: arm64
xcode: 14a5294e # xcode 14.0 beta 5
mac_x64:
properties:
dependencies: >-
Expand All @@ -36,7 +47,7 @@ platform_properties:
device_type: none
cpu: x86
xcode: 14a5294e # xcode 14.0 beta 5


targets:
### iOS+macOS tasks ***
Expand Down Expand Up @@ -74,7 +85,30 @@ targets:
channel: stable

### iOS tasks ###
# TODO(stuartmorgan): Swap this and ios-build_all_plugins once simulator
# TODO(stuartmorgan): Swap this ios_platform_tests_* once simulator
# tests are reliable on the ARM infrastructure. See discussion at
# https://github.com/flutter/plugins/pull/5693#issuecomment-1126011089
- name: Mac_arm64 ios_build_all_plugins master
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The second space doesn't messing up the recipe script, right? I can picture a bug related to splitting on the spaces to parse Mac_arm64, but I didn't look.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the format we've been using for all of the packages and plugins LUCI tasks, and the script has been happy with it. Infra folks helped set up the initial naming structure.

bringup: true
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you temporarily remove bringup: true to force this to run in presubmit on this PR does it pass? In the framework repo there's a check that complains if the key is missing, but I'm not sure if it'll complain in the plugins repo.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like ci.yaml validation failure prevents any LUCI tests from running?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Those are the existing Cirrus versions :)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh right, that's what we're doing here.

recipe: plugins/plugins
timeout: 30
properties:
add_recipes_cq: "true"
version_file: flutter_master.version
target_file: ios_build_all_plugins.yaml
channel: master

- name: Mac_arm64 ios_build_all_plugins stable
bringup: true
recipe: plugins/plugins
timeout: 30
properties:
add_recipes_cq: "true"
version_file: flutter_stable.version
target_file: ios_build_all_plugins.yaml
channel: stable

# 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: Mac_x64 ios_platform_tests_1_of_4 master
Expand Down
3 changes: 2 additions & 1 deletion .ci/scripts/build_all_plugins.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@

platform="$1"
build_mode="$2"
shift 2
cd all_packages
flutter build "$platform" --"$build_mode"
flutter build "$platform" --"$build_mode" "$@"
11 changes: 11 additions & 0 deletions .ci/targets/ios_build_all_plugins.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
tasks:
- name: prepare tool
script: .ci/scripts/prepare_tool.sh
- name: create all_plugins app
script: .ci/scripts/create_all_plugins_app.sh
- name: build all_plugins for iOS debug
script: .ci/scripts/build_all_plugins.sh
args: ["ios", "debug", "--no-codesign"]
- name: build all_plugins for iOS release
script: .ci/scripts/build_all_plugins.sh
args: ["ios", "release", "--no-codesign"]
4 changes: 2 additions & 2 deletions .ci/targets/mac_build_all_plugins.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ tasks:
script: .ci/scripts/prepare_tool.sh
- name: create all_plugins app
script: .ci/scripts/create_all_plugins_app.sh
- name: build all_plugins debug
- name: build all_plugins for macOS debug
script: .ci/scripts/build_all_plugins.sh
args: ["macos", "debug"]
- name: build all_plugins release
- name: build all_plugins for macOS release
script: .ci/scripts/build_all_plugins.sh
args: ["macos", "release"]
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ tasks:
script: .ci/scripts/prepare_tool.sh
- name: create all_plugins app
script: .ci/scripts/create_all_plugins_app.sh
- name: build all_plugins debug
- name: build all_plugins for Windows debug
script: .ci/scripts/build_all_plugins.sh
args: ["windows", "debug"]
- name: build all_plugins release
- name: build all_plugins for Windows release
script: .ci/scripts/build_all_plugins.sh
args: ["windows", "release"]