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

Update builders to Xcode 13 and macOS 12#31915

Merged
fluttergithubbot merged 14 commits into
flutter-team-archive:mainfrom
jmagman:xcode-13
Mar 29, 2022
Merged

Update builders to Xcode 13 and macOS 12#31915
fluttergithubbot merged 14 commits into
flutter-team-archive:mainfrom
jmagman:xcode-13

Conversation

@jmagman

@jmagman jmagman commented Mar 9, 2022

Copy link
Copy Markdown
Contributor

Leave Mac Web Builder on Xcode 12.3 due to flutter/flutter#99885. Upgrade all other builders.
Fixes flutter/flutter#99698
Fixes flutter/flutter#85555

Blocking flutter/flutter#94078

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 Flutter Style Guide and the C++, Objective-C, Java style guides.
  • I listed at least one issue that this PR fixes in the description above.
  • I added new tests to check the change I am making or feature I am adding, or Hixie said the PR is test-exempt. See testing the engine for instructions on
    writing and running engine tests.
  • I updated/added relevant documentation (doc comments with ///).
  • I signed the CLA.
  • All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel on Discord.

@jmagman jmagman self-assigned this Mar 9, 2022
@jmagman jmagman changed the title Update tests to Xcode 13 and macOS 12 Update builders to Xcode 13 and macOS 12 Mar 9, 2022
Comment thread .ci.yaml
Comment on lines +63 to +65
{"name":"xcode_runtime_ios-13-0","path":"xcode_runtime_ios-13-0"},
{"name":"xcode_runtime_ios-15-0","path":"xcode_runtime_ios-15-0"}

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Comment thread .ci.yaml
Comment on lines +74 to +79
runtime_versions: >-
[
"ios-13",
"ios-15"
]

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Comment thread .ci.yaml
[
{"name":"flutter_cocoapods","path":"cocoapods"},
{"name":"old_osx_sdk","path":"osx_sdk"},
{"name":"osx_sdk_13a233_13_15","path":"osx_sdk"},

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I'm not sure what old_osx_sdk should be renamed to given flutter/flutter#99586 since the names were different between the engine and framework. osx_sdk_13a233_13_15 is for Xcode 13a233 + iOS 13 + iOS 15 but I'm open to suggestions here.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

old_osx_sdk and osx_sdk were used to transition between two versions of xcode without impacting the builders. Now that we need multiple caches updating the name with version string is a better option.

Comment thread .ci.yaml
scheduler: luci
runIf:
- DEPS
- .ci.yaml

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

The web tests should run on PRs like this one that change their configurations.

@jmagman

jmagman commented Mar 9, 2022

Copy link
Copy Markdown
Contributor Author

Tests will fail until flutter/cocoon#1652 is published.

@yusuf-goog yusuf-goog left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM with a question. @godofredoc should Ok the cache related changes.

Comment thread .ci.yaml Outdated
os: Mac-12
runtime_versions: >-
[
"ios-13",

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Some places, these are specified as ios-13-0. Not sure if it matters?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

In the past we were tracking minor versions just to be sure that updates were not breaking the builds and or generating different performance results.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

You were right, these need to match the cipd refs, ios-13-0 etc

#0 mac_toolchain/install.go:311 - main.resolveRuntimeRef()
  reason: Failed to resolve runtime ref given runtime version: ios-13, xcode version: .

https://logs.chromium.org/logs/flutter/buildbucket/cr-buildbucket/8820126450450034161/+/u/install_xcode_runtime_ios-13/stdout

@jmagman

jmagman commented Mar 9, 2022

Copy link
Copy Markdown
Contributor Author

Both of these are running with old versions of macOS and Xcode? The rest of the tests picked up the properties though.
https://ci.chromium.org/p/flutter/builders/try/Mac%20Unopt/9950?
https://ci.chromium.org/p/flutter/builders/try/Mac%20Web%20Engine/23525?

@jmagman

jmagman commented Mar 9, 2022

Copy link
Copy Markdown
Contributor Author

Rebasing to run them again on published flutter/cocoon#1652

@CaseyHillers

Copy link
Copy Markdown
Contributor

Rebasing to run them again on published https://github.com/flutter/cocoon/pull/1652[](https://github.com/jmagman)

Sorry to be nitty, but for future infra issues can you merge instead of rebase? GitHub wipe's check run state on rebase so it's hard for me to take action on why the properties weren't propagating

@jmagman

jmagman commented Mar 9, 2022

Copy link
Copy Markdown
Contributor Author

Rebasing to run them again on published [https://github.com/flutter/cocoon/pull/1652](flutter/cocoon#1652)

Sorry to be nitty, but for future infra issues can you merge instead of rebase? GitHub wipe's check run state on rebase so it's hard for me to take action on why the properties weren't propagating

Will do. 🙂

@jmagman

jmagman commented Mar 10, 2022

Copy link
Copy Markdown
Contributor Author

Mac Web Engine felt ios-safari test tests timing out, filed flutter/flutter#99885

@keyonghan

Copy link
Copy Markdown
Contributor

/cc @godofredoc

@chinmaygarde

Copy link
Copy Markdown
Contributor

@jmagman I believe a rebase ought to unblock this patch. Are there blockers other than presubmits here?

@jmagman

jmagman commented Mar 25, 2022

Copy link
Copy Markdown
Contributor Author

This is blocked on flutter/flutter#99885. Making a draft.

@jmagman jmagman marked this pull request as draft March 25, 2022 00:29
@flutter-dashboard

Copy link
Copy Markdown

This pull request has been changed to a draft. The currently pending flutter-gold status will not be able to resolve until a new commit is pushed or the change is marked ready for review again.

@CaseyHillers

Copy link
Copy Markdown
Contributor

The ci.yaml roller failed on this PR - https://ci.chromium.org/ui/p/flutter/builders/staging/Linux%20ci_yaml%20engine%20roller/2084/overview

The caches change contains invalid characters. You'll need to swap the special characters to only be underscores

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

waiting for tree to go green This PR is approved and tested, but waiting for the tree to be green to land.

Development

Successfully merging this pull request may close these issues.

Allow iOS simulator runtimes to be set from .ci.yaml Make iOS 15 SDK and runtime available to engine builders

7 participants