Skip to content

Conversation

@andrewkolos
Copy link
Contributor

@andrewkolos andrewkolos commented Dec 8, 2023

Partially resolves1 #139774.

Effectively reverts #125581.

The main change here is that I deleted and recreated the macos Xcode project for this integration test (hence the large diff). I tried fixing the existing project first, but it was set up quite differently, and—for whatever reason—the integration test would get stuck trying to load dev/integration_tests/flavors/integration_test/integration_test.dart.

I verified that this works locally, but I don't know if it's possible to run this on the devicelab try pool to verify that it works on devicelab hardware.

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.

Footnotes

  1. I would not close the issue until 1) this PR lands, 2) the integration test consistently passes on CI, and 3) macOS support for flavors is publicly documented.

@andrewkolos andrewkolos added the tool Affects the "flutter" command-line tool. See also t: labels. label Dec 8, 2023
@github-actions github-actions bot removed the tool Affects the "flutter" command-line tool. See also t: labels. label Dec 8, 2023
@andrewkolos andrewkolos force-pushed the fix-flavors-macos-test branch from 92bfe9c to e0caf9c Compare December 13, 2023 20:56
@github-actions github-actions bot added the a: desktop Running on desktop label Dec 14, 2023
Comment on lines +1 to +16
Copy link
Contributor Author

@andrewkolos andrewkolos Dec 14, 2023

Choose a reason for hiding this comment

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

I wanted to delete this file, but even when I delete the RunnerTests target via the Xcode UI (as well as the RunnerTests folder), there are still a bunch of references RunnerTests throughout the dev/integration_tests/flavors/macos/Runner.xcodeproj/project.pbxproj file. I'd rather just leave this alone, as I want the project to remain as close to a vanilla state (the one that a user creating a new project and following the documentation would have) as possible.

@andrewkolos andrewkolos marked this pull request as ready for review December 14, 2023 07:32
@andrewkolos andrewkolos requested a review from jmagman December 14, 2023 07:34
@andrewkolos andrewkolos added tool Affects the "flutter" command-line tool. See also t: labels. platform-mac Building on or for macOS specifically labels Dec 14, 2023
.ci.yaml Outdated
Copy link
Member

Choose a reason for hiding this comment

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

I verified that this works locally, but I don't know if it's possible to run this on the devicelab try pool to verify that it works on devicelab hardware.

If you make this true will it run in the devicelab in this PR? And then revert it back to false before you merge?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I don't think this is possible. Setting presubmit to true didn't make it run, and the ci.yaml analysis check will fail if bringup is not set to true. However, I was able to manually run a task to get this tested: https://ci.chromium.org/raw/build/logs.chromium.org/flutter/led/andrewkolos_google.com/ec64b67b7abc35f5557ddd021c295affa0b063a77b488f2d920061e99900a674/+/build.proto?server=chromium-swarm.appspot.com

@github-actions github-actions bot removed the tool Affects the "flutter" command-line tool. See also t: labels. label Dec 14, 2023
@andrewkolos andrewkolos requested a review from jmagman December 14, 2023 22:55
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.

Thanks for tackling this!

try restore test again
This reverts commit 8fdcf67834fbb6ff3a024718593e8e3c9398258b.
@andrewkolos andrewkolos force-pushed the fix-flavors-macos-test branch from 56103e9 to 9cfab8c Compare December 18, 2023 06:49
@andrewkolos andrewkolos added the autosubmit Merge PR when tree becomes green via auto submit App label Dec 18, 2023
@auto-submit auto-submit bot merged commit f8b9748 into flutter:master Dec 18, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 18, 2023
auto-submit bot pushed a commit to flutter/packages that referenced this pull request Dec 18, 2023
flutter/flutter@2407f69...cdc83e5

2023-12-18 [email protected] Roll Flutter Engine from b3de65a6d3ea to 7f1a81d5545a (1 revision) (flutter/flutter#140309)
2023-12-18 [email protected] refactored cli tool ipa method name to support --export-options-plist (flutter/flutter#138555)
2023-12-18 [email protected] Restore and fix flavors_test_macos (flutter/flutter#139841)
2023-12-18 [email protected] Roll Flutter Engine from 626c93260f79 to b3de65a6d3ea (1 revision) (flutter/flutter#140308)
2023-12-17 [email protected] Roll Flutter Engine from f9c7aa27f13a to 626c93260f79 (1 revision) (flutter/flutter#140291)
2023-12-17 [email protected] Roll Flutter Engine from 726a137e3f99 to f9c7aa27f13a (1 revision) (flutter/flutter#140289)
2023-12-16 [email protected] Roll Flutter Engine from c5fc179cf0b3 to 726a137e3f99 (1 revision) (flutter/flutter#140280)
2023-12-16 [email protected] Roll Flutter Engine from a8d8fbbcef22 to c5fc179cf0b3 (1 revision) (flutter/flutter#140277)
2023-12-16 [email protected] Center Floating Snackbar with custom width when direction is RTL (flutter/flutter#140215)
2023-12-16 [email protected] Roll Flutter Engine from 6752398c2f54 to a8d8fbbcef22 (1 revision) (flutter/flutter#140274)
2023-12-16 [email protected] Use `SemanticsUpdateBuilder` again, remove all references to temporary `SemanticsUpdateBuilderNew` (flutter/flutter#139942)
2023-12-16 [email protected] Roll Flutter Engine from 7d300e5b9587 to 6752398c2f54 (1 revision) (flutter/flutter#140270)
2023-12-16 [email protected] Roll Flutter Engine from 832238a3b493 to 7d300e5b9587 (1 revision) (flutter/flutter#140268)
2023-12-16 [email protected] Roll Flutter Engine from 34d427aa009c to 832238a3b493 (1 revision) (flutter/flutter#140265)
2023-12-16 [email protected] Roll Flutter Engine from 74e4965a2845 to 34d427aa009c (1 revision) (flutter/flutter#140263)
2023-12-16 [email protected] Roll Flutter Engine from ca329dd84207 to 74e4965a2845 (4 revisions) (flutter/flutter#140262)
2023-12-16 [email protected] [github actions] minor PR to test latest github actions (flutter/flutter#140252)
2023-12-16 [email protected] Roll Flutter Engine from 6e3a04874be5 to ca329dd84207 (3 revisions) (flutter/flutter#140255)
2023-12-15 [email protected] Remove usage of testWidgetsWithLeakTracking. (flutter/flutter#140239)
2023-12-15 [email protected] Roll Flutter Engine from a8d861b53db1 to 6e3a04874be5 (1 revision) (flutter/flutter#140244)
2023-12-15 [email protected] Roll Flutter Engine from c48b08ac4682 to a8d861b53db1 (1 revision) (flutter/flutter#140240)
2023-12-15 [email protected] Use new `enabledFeature` param for `Analytics` (flutter/flutter#139934)
2023-12-15 [email protected] Roll Flutter Engine from db98451b063c to c48b08ac4682 (2 revisions) (flutter/flutter#140236)
2023-12-15 [email protected] Reorganize dependencies on leak_tracker. (flutter/flutter#140233)
2023-12-15 [email protected] [macOS,iOS] CocoaPods recommended version: 1.13.0 (flutter/flutter#135447)
2023-12-15 [email protected] Roll Flutter Engine from b36374085c4b to db98451b063c (1 revision) (flutter/flutter#140230)
2023-12-15 [email protected] Roll Flutter Engine from e89b7ed8812b to b36374085c4b (1 revision) (flutter/flutter#140228)
2023-12-15 [email protected] Roll Flutter Engine from 986a6fe198dc to e89b7ed8812b (1 revision) (flutter/flutter#140224)

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-packages
Please CC [email protected],[email protected],[email protected] on the revert to ensure that a human
is aware of the problem.

To file a bug in Packages: https://github.com/flutter/flutter/issues/new/choose

To report a problem with the AutoRoller itself, please file a bug:
https://issues.skia.org/issues/new?component=1389291&template=1850622

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
@jmagman
Copy link
Member

jmagman commented Dec 19, 2023

@andrewkolos The test doesn't seem to be getting scheduled? Not sure why.

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 16, 2024
@andrewkolos andrewkolos deleted the fix-flavors-macos-test branch April 29, 2024 18:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

a: desktop Running on desktop autosubmit Merge PR when tree becomes green via auto submit App platform-mac Building on or for macOS specifically

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants