Skip to content

Conversation

@reidbaker
Copy link
Contributor

@reidbaker reidbaker commented Apr 4, 2025

Similar to #166438

Fixes #66553

Cherry pick the following prs to hopefully fix pre/post submits against 3.29.

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].
  • I followed the [breaking change policy] and added [Data Driven Fixes] where supported.
  • All existing and new tests are passing.

jason-simmons and others added 4 commits April 4, 2025 14:31
…65675)

This test was not running previously on the Linux builder, but it
started running again when ASAN was disabled due to the Ubuntu 24
upgrade on LUCI. The test is not currently functioning as intended and
needs to be disabled until the Ubuntu upgrade is stable.

See flutter#165661
Most of our tests that need graphics already skip Firefox. This test
somehow was lucky enough to pass in Firefox until the latest Ubuntu
upgrade. It is finally failing as expected, so skipping.

Co-authored-by: Kevin Moore <[email protected]>
@reidbaker reidbaker requested review from a team and matanlurey as code owners April 4, 2025 18:41
@github-actions github-actions bot added a: text input Entering text in a text field or keyboard related problems platform-android Android applications specifically platform-ios iOS applications specifically tool Affects the "flutter" command-line tool. See also t: labels. framework flutter/packages/flutter repository. See also f: labels. engine flutter/engine related. See also e: labels. a: animation Animation APIs f: material design flutter/packages/flutter/material repository. f: scrolling Viewports, list views, slivers, etc. f: cupertino flutter/packages/flutter/cupertino repository d: api docs Issues with https://api.flutter.dev/ d: examples Sample code and demos platform-web Web applications specifically a: desktop Running on desktop e: impeller Impeller rendering backend issues and features requests team-ios Owned by iOS platform team labels Apr 4, 2025
@reidbaker reidbaker changed the base branch from master to flutter-3.29-candidate.0 April 4, 2025 18:42
Copy link
Contributor

@yjbanov yjbanov left a comment

Choose a reason for hiding this comment

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

lgtm

@github-actions github-actions bot removed platform-ios iOS applications specifically tool Affects the "flutter" command-line tool. See also t: labels. framework flutter/packages/flutter repository. See also f: labels. a: animation Animation APIs f: material design flutter/packages/flutter/material repository. f: scrolling Viewports, list views, slivers, etc. f: cupertino flutter/packages/flutter/cupertino repository d: api docs Issues with https://api.flutter.dev/ d: examples Sample code and demos a: desktop Running on desktop e: impeller Impeller rendering backend issues and features requests labels Apr 7, 2025
@reidbaker
Copy link
Contributor Author

I am close to abandoning the ability to run presubmits in this branch.

@eyebrowsoffire
Copy link
Contributor

I am close to abandoning the ability to run presubmits in this branch.

Seems like legitimate failures related to the cherry-picks though:

RUNNING: cd .; bin/flutter analyze --flutter-repo --watch --benchmark
workingDirectory: /b/s/w/ir/x/w/flutter, executable: /b/s/w/ir/x/w/flutter/bin/flutter, arguments: [analyze, --flutter-repo, --watch, --benchmark]
Analyzing Flutter repository...                                    22.1s


warning • The declaration 'pinEngineVersionForReleaseBranch' isn't referenced • dev/tools/test/update_engine_version_test.dart:121:8 • unused_element
warning • The declaration 'gitMergeBase' isn't referenced • dev/tools/test/update_engine_version_test.dart:143:10 • unused_element
  error • The getter 'binCacheEngineStamp' isn't defined for the type '_FlutterRootUnderTest' • dev/tools/test/update_engine_version_test.dart:177:43 • undefined_getter
3 issues found. (3 new) • analyzed 5139 files (ran in 22.12s)
Analysis benchmark written to analysis_benchmark.json ({time: 22.118, issues: 3}).

@reidbaker
Copy link
Contributor Author

I am close to abandoning the ability to run presubmits in this branch.

Seems like legitimate failures related to the cherry-picks though:

RUNNING: cd .; bin/flutter analyze --flutter-repo --watch --benchmark
workingDirectory: /b/s/w/ir/x/w/flutter, executable: /b/s/w/ir/x/w/flutter/bin/flutter, arguments: [analyze, --flutter-repo, --watch, --benchmark]
Analyzing Flutter repository...                                    22.1s


warning • The declaration 'pinEngineVersionForReleaseBranch' isn't referenced • dev/tools/test/update_engine_version_test.dart:121:8 • unused_element
warning • The declaration 'gitMergeBase' isn't referenced • dev/tools/test/update_engine_version_test.dart:143:10 • unused_element
  error • The getter 'binCacheEngineStamp' isn't defined for the type '_FlutterRootUnderTest' • dev/tools/test/update_engine_version_test.dart:177:43 • undefined_getter
3 issues found. (3 new) • analyzed 5139 files (ran in 22.12s)
Analysis benchmark written to analysis_benchmark.json ({time: 22.118, issues: 3}).

Yes, I am trying to decide how many more releases to stable we need to do and if this is worth it.
Most of the cherry picks required a mechanical merge resolution and I clearly didnt do a good job.

@reidbaker reidbaker force-pushed the i166553-unbreak-presubmit-on-stable-2025-04-04 branch from c0764f3 to 2841ccf Compare April 8, 2025 16:44
@reidbaker
Copy link
Contributor Author

Removed GIT_DIR cp that was poorly merged.

@reidbaker reidbaker added the autosubmit Merge PR when tree becomes green via auto submit App label Apr 8, 2025
@auto-submit
Copy link
Contributor

auto-submit bot commented Apr 8, 2025

autosubmit label was removed for flutter/flutter/166594, because This PR has not met approval requirements for merging. Changes were requested by {eyebrowsoffire}, please make the needed changes and resubmit this PR.
The PR author is a member of flutter-hackers and needs 0 more review(s) in order to merge this PR.

  • Merge guidelines: A PR needs at least one approved review if the author is already part of flutter-hackers or two member reviews if the author is not a flutter-hacker before re-applying the autosubmit label. Reviewers: If you left a comment approving, please use the "approve" review action instead.

@auto-submit auto-submit bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Apr 8, 2025
Copy link
Contributor

@eyebrowsoffire eyebrowsoffire left a comment

Choose a reason for hiding this comment

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

LGTM!

@reidbaker reidbaker added the autosubmit Merge PR when tree becomes green via auto submit App label Apr 8, 2025
@auto-submit auto-submit bot merged commit 915efb1 into flutter:flutter-3.29-candidate.0 Apr 8, 2025
150 checks passed
@reidbaker reidbaker deleted the i166553-unbreak-presubmit-on-stable-2025-04-04 branch April 8, 2025 19:18
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 14, 2025
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 15, 2025
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 15, 2025
Fintasys pushed a commit to Fintasys/flutter that referenced this pull request May 14, 2025
Similar to flutter#166438

Fixes flutter#66553

Cherry pick the following prs to hopefully fix pre/post submits against 3.29.

* flutter#165692
* flutter#165675
* flutter#165678
* flutter#166559
* Does not include flutter#165818
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

autosubmit Merge PR when tree becomes green via auto submit App engine flutter/engine related. See also e: labels. platform-web Web applications specifically team-ios Owned by iOS platform team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants