Skip to content

Check for watch companion in build settings#114078

Merged
auto-submit[bot] merged 6 commits intoflutter:masterfrom
vashworth:watch_check_update
Oct 27, 2022
Merged

Check for watch companion in build settings#114078
auto-submit[bot] merged 6 commits intoflutter:masterfrom
vashworth:watch_check_update

Conversation

@vashworth
Copy link
Contributor

@vashworth vashworth commented Oct 26, 2022 •
edited
Loading

Add an additional check for watch companion by checking build settings of different schemes.

Fixes #92294.

Re-land of #113956.

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, including Features we expect every widget to implement.
  • I signed the CLA.
  • I listed at least one issue that this PR fixes in the description above.
  • I updated/added relevant documentation (doc comments with ///).
  • I added new tests to check the change I am making, or this PR is test-exempt.
  • All existing and new tests are passing.

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

@flutter-dashboard flutter-dashboard bot added platform-ios iOS applications specifically c: contributor-productivity Team-specific productivity, code health, technical debt. tool Affects the "flutter" command-line tool. See also t: labels. labels Oct 26, 2022
@vashworth vashworth requested a review from jmagman October 26, 2022 15:54
@vashworth vashworth marked this pull request as ready for review October 26, 2022 20:55
jmagman
jmagman reviewed Oct 26, 2022
View reviewed changes
Copy link
Member

@jmagman jmagman left a comment

Choose a reason for hiding this comment

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

You should also add a note in the description that this is a re-land of #113956 so we can follow the GitHub paper trail in the future.

I'm not on my machine that's missing watch simulators today to test this. How about removing presubmit: false from these tests:

flutter/.ci.yaml

Lines 3493 to 3509 in 156c313

- name: Mac_ios ios_app_with_extensions_test
recipe: devicelab/devicelab_drone
presubmit: false
timeout: 60
properties:
tags: >
["devicelab", "ios", "mac"]
task_name: ios_app_with_extensions_test
- name: Mac_arm64_ios ios_app_with_extensions_test
recipe: devicelab/devicelab_drone
presubmit: false
timeout: 60
properties:
tags: >
["devicelab", "ios", "mac", "arm64"]
task_name: ios_app_with_extensions_test

and then we'll see if the tests pass on this PR. And if they do, you can revert that change since we rarely change this behavior and don't really need to run it on every PR.

@vashworth vashworth requested a review from keyonghan as a code owner October 27, 2022 15:20
@vashworth vashworth requested review from jmagman and removed request for keyonghan October 27, 2022 16:19
jmagman
jmagman approved these changes Oct 27, 2022
View reviewed changes
Copy link
Member

@jmagman jmagman left a comment

Choose a reason for hiding this comment

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

This looks good. Add the bringup key to .ci.yaml as suggested so we don't break the tree again, then we'll merge!

@jmagman
Copy link
Member

jmagman commented Oct 27, 2022 •
edited
Loading

This looks good. Add the bringup key to .ci.yaml as suggested so we don't break the tree again, then we'll merge!

Correction: I meant remove presubmit: false #114078 (review), verify the tests pass, and then revert and we can merge 🙂

jmagman
jmagman approved these changes Oct 27, 2022
View reviewed changes
Copy link
Member

@jmagman jmagman left a comment

Choose a reason for hiding this comment

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

Ah you already did this, and they passed.
https://ci.chromium.org/p/flutter/builders/try/Mac_arm64_ios%20ios_app_with_extensions_test/1
https://ci.chromium.org/p/flutter/builders/try/Mac_ios%20ios_app_with_extensions_test/1

LGTM!

@vashworth vashworth added autosubmit Merge PR when tree becomes green via auto submit App and removed autosubmit Merge PR when tree becomes green via auto submit App labels Oct 27, 2022
@auto-submit auto-submit bot merged commit 8aad119 into flutter:master Oct 27, 2022
This was referenced Oct 28, 2022
Closed
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 28, 2022
@engine-flutter-autoroll
8aad119 Check for watch companion in build settings (flutter/flutter#…
e818e2f 
…114078)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/plugins that referenced this pull request Oct 28, 2022
@engine-flutter-autoroll
8aad119 Check for watch companion in build settings (flutter/flutter#…
482956d 
…114078)
@vashworth vashworth deleted the watch_check_update branch October 28, 2022 15:50
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Oct 28, 2022
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/plugins that referenced this pull request Oct 28, 2022
@engine-flutter-autoroll
8aad119 Check for watch companion in build settings (flutter/flutter#…
8c606ba 
…114078)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Oct 28, 2022
Merged
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 28, 2022
@engine-flutter-autoroll
8aad119 Check for watch companion in build settings (flutter/flutter#…
4243b6d 
…114078)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Oct 28, 2022
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/plugins that referenced this pull request Oct 28, 2022
@engine-flutter-autoroll
8aad119 Check for watch companion in build settings (flutter/flutter#…
32f3ee1 
…114078)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jmagman jmagman jmagman approved these changes

Assignees

No one assigned

Labels

autosubmit Merge PR when tree becomes green via auto submit App c: contributor-productivity Team-specific productivity, code health, technical debt. platform-ios iOS applications specifically tool Affects the "flutter" command-line tool. See also t: labels.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Flutter build error after adding WatchOS target in Xcode Project

2 participants

@vashworth @jmagman