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.

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

Copy canvaskit files directly into flutter_web_sdk #40951

Merged
merged 2 commits into from
Apr 5, 2023

Conversation

eyebrowsoffire
Copy link
Contributor

Since the flutter tool now always looks inside the flutter_web_sdk artifact for canvaskit/skwasm files, we should copy them to their expected location inside the flutter_web_sdk, so that --local-web-sdk works correctly when targeting a local build.

@flutter-dashboard flutter-dashboard bot added the platform-web Code specifically for the web engine label Apr 5, 2023
@eyebrowsoffire eyebrowsoffire requested a review from mdebbar April 5, 2023 21:22
Copy link
Contributor

@harryterkelsen harryterkelsen left a comment

Choose a reason for hiding this comment

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

LGTM

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

@eyebrowsoffire eyebrowsoffire added the autosubmit Merge PR when tree becomes green via auto submit App label Apr 5, 2023
@auto-submit
Copy link
Contributor

auto-submit bot commented Apr 5, 2023

auto label is removed for flutter/engine, pr: 40951, due to - The status or check suite Linux Web Framework tests has failed. Please fix the issues identified (or deflake) before re-applying this label.

@auto-submit auto-submit bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Apr 5, 2023
@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 #40951 at sha 5446d31

@eyebrowsoffire eyebrowsoffire added the autosubmit Merge PR when tree becomes green via auto submit App label Apr 5, 2023
@auto-submit auto-submit bot merged commit 55d7806 into flutter:main Apr 5, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Apr 6, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Apr 6, 2023
zanderso pushed a commit to flutter/flutter that referenced this pull request Apr 6, 2023
…ions) (#124300)

Manual roll requested by zra@google.com

flutter/engine@610cdf0...1ec74c6

2023-04-06 110993981+htoor3@users.noreply.github.com Revert "[web] Move
text editing nodes outside of shadowDOM - reopened"
(flutter/engine#40960)
2023-04-05 110993981+htoor3@users.noreply.github.com [web] Move text
editing nodes outside of shadowDOM - reopened (flutter/engine#40904)
2023-04-05 30870216+gaaclarke@users.noreply.github.com [Impeller]
adjusted the rotated text test to have an opaque background and account
for screen scale (flutter/engine#40954)
2023-04-05 jacksongardner@google.com Copy canvaskit files directly into
`flutter_web_sdk` (flutter/engine#40951)

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-engine-flutter-autoroll
Please CC jonahwilliams@google.com,rmistry@google.com,zra@google.com on
the revert to ensure that a human
is aware of the problem.

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

To report a problem with the AutoRoller itself, please file a bug:
https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug

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

This change broke Dart/Flutter HEAD-HEAD-HEAD bot.

It caused the following GN errors during "gn --full-dart-sdk --no-prebuilt-dart-sdk" step:

Generating GN files in: out/host_debug
ERROR Input to target not generated by a dependency.
The file:
  //out/host_debug/skwasm.wasm
is listed as an input or source for the target:
  //flutter/third_party/canvaskit:skwasm_group
but no targets in the build generate that file.

ERROR Input to target not generated by a dependency.
The file:
  //out/host_debug/skwasm.worker.js
is listed as an input or source for the target:
  //flutter/third_party/canvaskit:skwasm_group
but no targets in the build generate that file.

If you have generated inputs, there needs to be a dependency path between the
two targets in addition to just listing the files. For indirect dependencies,
the intermediate ones must be public_deps. data_deps don't count since they're
only runtime dependencies. If you think a dependency chain exists, it might be
because the chain is private. Try "gn path" to analyze.

2 generated input errors found.

https://logs.chromium.org/logs/dart/buildbucket/cr-buildbucket/8784588539471655729/+/u/gn_--full-dart-sdk_--no-prebuilt-dart-sdk/stdout

https://ci.chromium.org/p/dart/builders/ci.sandbox/flutter-engine-linux/19512

@eyebrowsoffire
Copy link
Contributor Author

@alexmarkov Fix for that issue is here: #40967

exaby73 pushed a commit to NevercodeHQ/flutter that referenced this pull request Apr 17, 2023
…ions) (flutter#124300)

Manual roll requested by zra@google.com

flutter/engine@610cdf0...1ec74c6

2023-04-06 110993981+htoor3@users.noreply.github.com Revert "[web] Move
text editing nodes outside of shadowDOM - reopened"
(flutter/engine#40960)
2023-04-05 110993981+htoor3@users.noreply.github.com [web] Move text
editing nodes outside of shadowDOM - reopened (flutter/engine#40904)
2023-04-05 30870216+gaaclarke@users.noreply.github.com [Impeller]
adjusted the rotated text test to have an opaque background and account
for screen scale (flutter/engine#40954)
2023-04-05 jacksongardner@google.com Copy canvaskit files directly into
`flutter_web_sdk` (flutter/engine#40951)

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-engine-flutter-autoroll
Please CC jonahwilliams@google.com,rmistry@google.com,zra@google.com on
the revert to ensure that a human
is aware of the problem.

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

To report a problem with the AutoRoller itself, please file a bug:
https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
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 platform-web Code specifically for the web engine will affect goldens
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants