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

[ci] Update macOS Cirrus image to Xcode 13 #4429

Merged
merged 2 commits into from
Oct 21, 2021
Merged

[ci] Update macOS Cirrus image to Xcode 13 #4429

merged 2 commits into from
Oct 21, 2021

Conversation

jmagman
Copy link
Member

@jmagman jmagman commented Oct 12, 2021 •
edited
Loading

In anticipation of flutter/flutter#91634 Flutter tool enforcement, and to use the latest Xcode and SDKs that our customers may be using, upgrade the macOS Cirrus image to Xcode 13.

cirruslabs/macos-image-templates#39

Pre-launch Checklist

  • I read the [Contributor Guide] and followed the process outlined there for submitting PRs.
  • I read the [Tree Hygiene] wiki page, which explains my responsibilities.
  • I read and followed the [relevant style guides] and ran [the auto-formatter]. (Note that unlike the flutter/flutter repo, the flutter/plugins repo does use dart format.)
  • I signed the [CLA].
  • The title of the PR starts with the name of the plugin surrounded by square brackets, e.g. [shared_preferences]
  • I listed at least one issue that this PR fixes in the description above.
  • I updated pubspec.yaml with an appropriate new version according to the [pub versioning philosophy].
  • I updated CHANGELOG.md to add a description of the change.
  • I updated/added relevant documentation (doc comments with ///).
  • I added new tests to check the change I am making or feature I am adding, or Hixie said the PR is test exempt.
  • All existing and new tests are passing.

@jmagman jmagman self-assigned this Oct 12, 2021
@google-cla google-cla bot added the cla: yes label Oct 12, 2021
@jmagman jmagman force-pushed the xcode-13 branch 2 times, most recently from 565986d to 543ff45 Compare October 14, 2021 00:23
jmagman
jmagman commented Oct 14, 2021
View reviewed changes
.cirrus.yml
@@ -274,7 +274,7 @@ task:
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-14-5 | xargs xcrun simctl boot
Copy link
Member Author

Choose a reason for hiding this comment

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

If the runtime isn't specified, it uses the latest available shipped in Xcode, which for Xcode 13 is iOS-15-0

Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe leave this as a comment? I liked that it was explicit and obvious what OS version we were testing with.

Copy link
Member Author

Choose a reason for hiding this comment

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

I can leave it as explicit and update to iOS-15-0, if you prefer.

@jmagman jmagman marked this pull request as ready for review October 14, 2021 16:53
stuartmorgan
stuartmorgan approved these changes Oct 15, 2021
View reviewed changes
Copy link
Contributor

@stuartmorgan stuartmorgan left a comment

Choose a reason for hiding this comment

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

LGTM with nit

.cirrus.yml
@@ -274,7 +274,7 @@ task:
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-14-5 | xargs xcrun simctl boot
Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe leave this as a comment? I liked that it was explicit and obvious what OS version we were testing with.

@jmagman jmagman force-pushed the xcode-13 branch 2 times, most recently from ce536b8 to 6934b35 Compare October 15, 2021 20:50
@jmagman jmagman mentioned this pull request Oct 15, 2021
Closed
3 tasks
@jmagman jmagman added the waiting for tree to go green (Use "autosubmit") This PR is approved and tested, but waiting for the tree to be green to land. label Oct 18, 2021
@stuartmorgan
Copy link
Contributor

I'm not sure why this hasn't landed during windows where the tree has been green, but I'm going to land this on red since the current red is flake we're suddenly seeing on iOS runs with errors about not being able to find the big-sur-xcode-12.5 VM, which might be "fixed" by landing this (assuming the problem is that some bots are only being provisioned with the latest, and nothing is preventing trying to use those bots for our runs).

@stuartmorgan stuartmorgan merged commit 5eec1e6 into flutter:master Oct 21, 2021
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Oct 21, 2021
Merged
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Oct 21, 2021
@engine-flutter-autoroll
5eec1e6 [ci] Update macOS Cirrus image to Xcode 13 (flutter/plugins#4429
9bfd9a5 
)
@jmagman jmagman deleted the xcode-13 branch October 21, 2021 20:00
@stuartmorgan
Copy link
Contributor

which might be "fixed" by landing this (assuming the problem is that some bots are only being provisioned with the latest, and nothing is preventing trying to use those bots for our runs).

Nope :(

Parallels isolation failed: failed to create VM cloned from "big-sur-xcode-13": Parallels VM operation failed: failed to get info for VM with "big-sur-xcode-13" UUID or name: Parallels command returned non-zero exit code: "Failed to get VM config: The virtual machine could not be found. The virtual machine is not registered in the virtual machine directory on your Mac."

@jmagman
Copy link
Member Author

jmagman commented Oct 21, 2021

Nope :(

This should now be resolved on Cirrus's end, I restarted the tests cirruslabs/cirrus-cli#469

NickalasB added a commit to NickalasB/plugins that referenced this pull request Oct 21, 2021
@NickalasB
Merge branch 'master' into implement_zoomEnabled_for_ios_and_android
6672b4f 
* master:
  [webview] Fix typos in the README (flutter#4249)
  [google_sign_in] add serverAuthCode to GoogleSignInAccount (flutter#4180)
  [ci] Update macOS Cirrus image to Xcode 13 (flutter#4429)
  [shared_preferences] Switch to new analysis options (flutter#4384)
  [flutter_plugin_android_lifecycle] remove placeholder dart file (flutter#4413)
  [camera] Run iOS methods on UI thread by default (flutter#4140)
  [ci] Always run all `format` steps (flutter#4427)
  [flutter_plugin_tools] Fix license-check on Windows (flutter#4425)
  [google_maps_flutter] Clean Java test, consolidate Marker example. (flutter#4400)
  [image_picker][android] suppress unchecked warning (flutter#4408)
  [ci] Replace Firebase Test Lab deprecated Pixel 4 device with Pixel 5 (flutter#4436)
  [image_picker_for_web] Added support for maxWidth, maxHeight and imageQuality  (flutter#4389)
  Bump compileSdkVersion to 31 (flutter#4432)
  [camera] Update [CameraOrientationTests testOrientationNotifications] unit test to work on Xcode 13 (flutter#4426)
  Update integration_test README  (flutter#3824)
  [webview_flutter] Adjust test URLs again (flutter#4407)
  [google_sign_in] Add serverAuthCode attribute to google_sign_in_platform_interface user data (flutter#4179)
  [camera] Add filter for unsupported cameras on Android (flutter#4418)
NickalasB added a commit to NickalasB/plugins that referenced this pull request Oct 21, 2021
@NickalasB
Merge branch 'master' into add_zoom_to_android_webview
eab9765 
* master:
  [webview] Fix typos in the README (flutter#4249)
  [google_sign_in] add serverAuthCode to GoogleSignInAccount (flutter#4180)
  [ci] Update macOS Cirrus image to Xcode 13 (flutter#4429)
  [shared_preferences] Switch to new analysis options (flutter#4384)
  [flutter_plugin_android_lifecycle] remove placeholder dart file (flutter#4413)
  [camera] Run iOS methods on UI thread by default (flutter#4140)
  [ci] Always run all `format` steps (flutter#4427)
  [flutter_plugin_tools] Fix license-check on Windows (flutter#4425)
  [google_maps_flutter] Clean Java test, consolidate Marker example. (flutter#4400)
  [image_picker][android] suppress unchecked warning (flutter#4408)
  [ci] Replace Firebase Test Lab deprecated Pixel 4 device with Pixel 5 (flutter#4436)
  [image_picker_for_web] Added support for maxWidth, maxHeight and imageQuality  (flutter#4389)
  Bump compileSdkVersion to 31 (flutter#4432)
  [camera] Update [CameraOrientationTests testOrientationNotifications] unit test to work on Xcode 13 (flutter#4426)
  Update integration_test README  (flutter#3824)
  [webview_flutter] Adjust test URLs again (flutter#4407)
  [google_sign_in] Add serverAuthCode attribute to google_sign_in_platform_interface user data (flutter#4179)
  [camera] Add filter for unsupported cameras on Android (flutter#4418)

# Conflicts:
#	packages/webview_flutter/webview_flutter/CHANGELOG.md
#	packages/webview_flutter/webview_flutter/pubspec.yaml
yasargil added a commit to yasargil/plugins that referenced this pull request Oct 25, 2021
@yasargil
Merge branch 'master' into gmain
d37dd69 
* master: (364 commits)
  Use OpenJDK 11 in CI jobs  (flutter#4419)
  [google_sign_in] remove the commented out code in tests (flutter#4442)
  [webview] Fix typos in the README (flutter#4249)
  [google_sign_in] add serverAuthCode to GoogleSignInAccount (flutter#4180)
  [ci] Update macOS Cirrus image to Xcode 13 (flutter#4429)
  [shared_preferences] Switch to new analysis options (flutter#4384)
  [flutter_plugin_android_lifecycle] remove placeholder dart file (flutter#4413)
  [camera] Run iOS methods on UI thread by default (flutter#4140)
  [ci] Always run all `format` steps (flutter#4427)
  [flutter_plugin_tools] Fix license-check on Windows (flutter#4425)
  [google_maps_flutter] Clean Java test, consolidate Marker example. (flutter#4400)
  [image_picker][android] suppress unchecked warning (flutter#4408)
  [ci] Replace Firebase Test Lab deprecated Pixel 4 device with Pixel 5 (flutter#4436)
  [image_picker_for_web] Added support for maxWidth, maxHeight and imageQuality  (flutter#4389)
  Bump compileSdkVersion to 31 (flutter#4432)
  [camera] Update [CameraOrientationTests testOrientationNotifications] unit test to work on Xcode 13 (flutter#4426)
  Update integration_test README  (flutter#3824)
  [webview_flutter] Adjust test URLs again (flutter#4407)
  [google_sign_in] Add serverAuthCode attribute to google_sign_in_platform_interface user data (flutter#4179)
  [camera] Add filter for unsupported cameras on Android (flutter#4418)
  ...

# Conflicts:
#	packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java
hofmannfelix pushed a commit to hofmannfelix/plugins that referenced this pull request Oct 30, 2021
Merge commit '76e84c0679dbab7bfaaaa553b17bb0dbdb9a3c33' into update_v…
1c83c0a 
…ideo_src_on_same_controller

* commit '76e84c0679dbab7bfaaaa553b17bb0dbdb9a3c33': (537 commits)
  [video_player] Initialize player when size and duration become available (flutter#4438)
  [webview_flutter] Implement zoom enabled for ios and android (flutter#4417)
  Partial revert of "upgraded usage of BinaryMessenger (flutter#4451)" (flutter#4453)
  Implement Android WebView api with pigeon (Java portion) (flutter#4441)
  [in_app_purchase] Update to the latest pkg:json_serializable (flutter#4434)
  Implement Android WebView api with pigeon (Dart portion)  (flutter#4435)
  upgraded usage of BinaryMessenger (flutter#4451)
  [flutter_plugin_tools] Fix pubspec-check on Windows (flutter#4428)
  Use OpenJDK 11 in CI jobs  (flutter#4419)
  [google_sign_in] remove the commented out code in tests (flutter#4442)
  [webview] Fix typos in the README (flutter#4249)
  [google_sign_in] add serverAuthCode to GoogleSignInAccount (flutter#4180)
  [ci] Update macOS Cirrus image to Xcode 13 (flutter#4429)
  [shared_preferences] Switch to new analysis options (flutter#4384)
  [flutter_plugin_android_lifecycle] remove placeholder dart file (flutter#4413)
  [camera] Run iOS methods on UI thread by default (flutter#4140)
  [ci] Always run all `format` steps (flutter#4427)
  [flutter_plugin_tools] Fix license-check on Windows (flutter#4425)
  [google_maps_flutter] Clean Java test, consolidate Marker example. (flutter#4400)
  [image_picker][android] suppress unchecked warning (flutter#4408)
  ...

# Conflicts:
#	packages/video_player/video_player/pubspec.yaml
#	packages/video_player/video_player_web/lib/video_player_web.dart
#	packages/video_player/video_player_web/pubspec.yaml
amantoux pushed a commit to amantoux/plugins that referenced this pull request Dec 11, 2021
@jmagman @amantoux
[ci] Update macOS Cirrus image to Xcode 13 (flutter#4429)
a9579a1 
In anticipation of flutter/flutter#91634 Flutter tool enforcement, and to use the latest Xcode and SDKs that our customers may be using, upgrade the macOS Cirrus image to Xcode 13.
@jmagman jmagman mentioned this pull request Dec 20, 2021
Closed
KyleFin pushed a commit to KyleFin/plugins that referenced this pull request Dec 21, 2021
@jmagman @KyleFin
[ci] Update macOS Cirrus image to Xcode 13 (flutter#4429)
6822b3d 
In anticipation of flutter/flutter#91634 Flutter tool enforcement, and to use the latest Xcode and SDKs that our customers may be using, upgrade the macOS Cirrus image to Xcode 13.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@stuartmorgan stuartmorgan stuartmorgan approved these changes

Assignees

@jmagman jmagman

Labels
cla: yes waiting for tree to go green (Use "autosubmit") This PR is approved and tested, but waiting for the tree to be green to land.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@jmagman @stuartmorgan