Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[flutter_releases] Flutter stable 3.22.3 Engine Cherrypicks #53686

Merged
merged 7 commits into from
Jul 12, 2024
Merged

[flutter_releases] Flutter stable 3.22.3 Engine Cherrypicks #53686

merged 7 commits into from
Jul 12, 2024

Conversation

itsjustkevin
Copy link
Contributor

@itsjustkevin itsjustkevin commented Jul 2, 2024 •
edited
Loading

@flutter-dashboard
Copy link

This pull request was opened from and to a release candidate branch. This should only be done as part of the official Flutter release process. If you are attempting to make a regular contribution to the Flutter project, please close this PR and follow the instructions at Tree Hygiene for detailed instructions on contributing to Flutter.

Reviewers: Use caution before merging pull requests to release branches. Ensure the proper procedure has been followed.

@christopherfujino
Copy link
Member 

________ running 'cipd ensure -log-level info -root C:\b\s\w\ir\cache\builder -ensure-file C:\b\s\w\ir\x\t\tmpqrmxhpug.ensure' in '.'
Errors:
  failed to resolve flutter/dart-sdk/windows-arm64@git_revision:60465149414572c8ca189d8f65fdb39795c4b97d (line 14): ambiguity when resolving the tag, more than one instance has it
Error: Command 'cipd ensure -log-level info -root C:\\b\\s\\w\\ir\\cache\\builder -ensure-file C:\\b\\s\\w\\ir\\x\\t\\tmpqrmxhpug.ensure' returned non-zero exit status 1
Errors:
  failed to resolve flutter/dart-sdk/windows-arm64@git_revision:60465149414572c8ca189d8f65fdb39795c4b97d (line 14): ambiguity when resolving the tag, more than one instance has it

I think we messed up and created duplicate tags

@christopherfujino christopherfujino mentioned this pull request Jul 3, 2024
Closed
@christopherfujino
Copy link
Member 

________ running 'cipd ensure -log-level info -root C:\b\s\w\ir\cache\builder -ensure-file C:\b\s\w\ir\x\t\tmpqrmxhpug.ensure' in '.'
Errors:
  failed to resolve flutter/dart-sdk/windows-arm64@git_revision:60465149414572c8ca189d8f65fdb39795c4b97d (line 14): ambiguity when resolving the tag, more than one instance has it
Error: Command 'cipd ensure -log-level info -root C:\\b\\s\\w\\ir\\cache\\builder -ensure-file C:\\b\\s\\w\\ir\\x\\t\\tmpqrmxhpug.ensure' returned non-zero exit status 1
Errors:
  failed to resolve flutter/dart-sdk/windows-arm64@git_revision:60465149414572c8ca189d8f65fdb39795c4b97d (line 14): ambiguity when resolving the tag, more than one instance has it

I think we messed up and created duplicate tags

Filing a tracking issue for this: flutter/flutter#151206

@christopherfujino
Copy link
Member 

________ running 'cipd ensure -log-level info -root C:\b\s\w\ir\cache\builder -ensure-file C:\b\s\w\ir\x\t\tmpqrmxhpug.ensure' in '.'
Errors:
  failed to resolve flutter/dart-sdk/windows-arm64@git_revision:60465149414572c8ca189d8f65fdb39795c4b97d (line 14): ambiguity when resolving the tag, more than one instance has it
Error: Command 'cipd ensure -log-level info -root C:\\b\\s\\w\\ir\\cache\\builder -ensure-file C:\\b\\s\\w\\ir\\x\\t\\tmpqrmxhpug.ensure' returned non-zero exit status 1
Errors:
  failed to resolve flutter/dart-sdk/windows-arm64@git_revision:60465149414572c8ca189d8f65fdb39795c4b97d (line 14): ambiguity when resolving the tag, more than one instance has it

I think we messed up and created duplicate tags

Filing a tracking issue for this: flutter/flutter#151206

I removed the tag from https://chrome-infra-packages.appspot.com/p/flutter/dart-sdk/windows-arm64/+/Yl9L7nIDSTcAgDFj9Q7Ce8jggdMszxCVHDT9hYMwoCMC, and have re-scheduled the windows presubmits

@christopherfujino christopherfujino mentioned this pull request Jul 3, 2024
Closed
@mkustermann @christopherfujino
Use dart.library.html to distinguish dart2wasm from dart2js/ddc in co…
9b3dfe9 
…nditional imports (flutter#53307)

Users of packages that have specialized code for the VM (which supports
FFI) use conditional imports based on `dart.library.ffi`. We don't want
the VM-specific code to be used for web in dart2wasm.

As a result we're going to make `dart.library.ffi` be false in
conditional imports (as well as in
`const bool.fromEnvironment('dart.library.ffi')`).

Issue dart-lang/sdk#55948
Issue flutter/flutter#149984
@github-actions github-actions bot added the platform-web Code specifically for the web engine label Jul 10, 2024
@christopherfujino
Copy link
Member

Per flutter/flutter#151558, I also cherrypicked ae9e092#diff-6608483a47ebedf1d8d4a0cb1e8c306dbed52fb5c1fc1485bdc48e2d99bdb0a1 to this branch

eyebrowsoffire and others added 2 commits July 11, 2024 16:13
@eyebrowsoffire
Port over browser_detection.dart changes
d11ae15
@mkustermann @jason-simmons
Use new dart:js_interop way to externalize/internalize objects (flutt…
133e8a8 
…er#53304)

The issue in [0] was fixed. So we no longer have to use conditional
imports and dart2wasm vs dart2js specific implementations.

Instead we use the new extension methods introduced due to [0], namely
`Object.toExternalReference` and `ExternalDartReference.toDartObject`.

[0] dart-lang/sdk#55183
@flutter-dashboard
Copy link

Golden file changes have been found for this pull request. Click here to view and triage (e.g. because this is an intentional change).

If you are still iterating on this change and are not ready to resolve the images on the Flutter Gold dashboard, consider marking this PR as a draft pull request above. You will still be able to view image results on the dashboard, commenting will be silenced, and the check will not try to resolve itself until marked ready for review.

Changes reported for pull request #53686 at sha 133e8a8

@christopherfujino
Copy link
Member

christopherfujino commented Jul 12, 2024 •
edited
Loading

Golden file changes have been found for this pull request. Click here to view and triage (e.g. because this is an intentional change).

If you are still iterating on this change and are not ready to resolve the images on the Flutter Gold dashboard, consider marking this PR as a draft pull request above. You will still be able to view image results on the dashboard, commenting will be silenced, and the check will not try to resolve itself until marked ready for review.

Changes reported for pull request #53686 at sha 133e8a8

To work around this, I pushed a commit (2bebada) deleting the impeller tests (I don't believe we ever ran golden tests on this branch previously), similar to this change on the 3.23 branch: #53178

@christopherfujino christopherfujino mentioned this pull request Jul 12, 2024
Merged
@christopherfujino christopherfujino merged commit a5180e4 into flutter:flutter-3.22-candidate.0 Jul 12, 2024
22 checks passed
christopherfujino
christopherfujino reviewed Jul 12, 2024
View reviewed changes
Copy link
Member

@christopherfujino christopherfujino left a comment

Choose a reason for hiding this comment

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

LGTM

@christopherfujino christopherfujino mentioned this pull request Jul 12, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@christopherfujino christopherfujino christopherfujino left review comments

@fluttergithubbot fluttergithubbot fluttergithubbot approved these changes

Assignees
No one assigned
Labels
platform-web Code specifically for the web engine will affect goldens
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@itsjustkevin @christopherfujino @fluttergithubbot @mkustermann @eyebrowsoffire