Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Move third_party/json to flutter/third_party/json. #48844

Merged
merged 10 commits into from
Dec 15, 2023

Conversation

matanlurey
Copy link
Contributor

As part of eliminating the Flutter buildroot (flutter/flutter#67373), we are moving all third-party dependencies from //third_party to //flutter/third_party.

@flutter-dashboard
Copy link

It looks like this pull request may not have tests. Please make sure to add tests before merging. If you need an exemption to this rule, contact "@text-exemption-reviewers" in the #hackers channel in Chat (don't just cc them here, they won't see it! Use Discord!).

If you are not sure if you need tests, consider this rule of thumb: the purpose of a test is to make sure someone doesn't accidentally revert the fix. Ask yourself, is there anything in your PR that you feel it is important we not accidentally revert back to how it was before your fix?

Reviewers: Read the Tree Hygiene page and make sure this patch meets those guidelines before LGTMing.

@matanlurey
Copy link
Contributor Author

Using prebuilt Dart SDK binary. If you are editing Dart sources and wish to compile the Dart SDK, set `--no-prebuilt-dart-sdk`.
Generating GN files in: out/host_debug
ERROR at //third_party/inja/BUILD.gn:42:19: Can't load input file.
  public_deps = [ "//flutter/third_party/json" ]
                  ^---------------------------
Unable to load:
  /b/s/w/ir/cache/builder/src/flutter/third_party/json/BUILD.gn
I also checked in the secondary tree for:
  /b/s/w/ir/cache/builder/src/flutter/build/secondary/flutter/third_party/json/BUILD.gn

@matanlurey matanlurey changed the title Move third_party/json to flutter/third_party/json. Move third_party/json to flutter/third_party/json. Dec 8, 2023
@matanlurey matanlurey added the autosubmit Merge PR when tree becomes green via auto submit App label Dec 13, 2023
@auto-submit auto-submit bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Dec 13, 2023
Copy link
Contributor

auto-submit bot commented Dec 13, 2023

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

@matanlurey matanlurey added the autosubmit Merge PR when tree becomes green via auto submit App label Dec 13, 2023
@auto-submit auto-submit bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Dec 13, 2023
Copy link
Contributor

auto-submit bot commented Dec 13, 2023

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

@@ -21,7 +21,7 @@ unset CDPATH
function follow_links() (
cd -P "$(dirname -- "$1")"
file="$PWD/$(basename -- "$1")"
while [[ -h "$file" ]]; do
while [[ -L "$file" ]]; do
Copy link
Member

Choose a reason for hiding this comment

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

I remember seeing a change in this flag between -h and -L in this or another PR, but I don't remember which is the new or old value, and which is correct. I think we discussed keeping the old value?

@@ -936,7 +936,7 @@ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
source, and configuration .
Copy link
Member

Choose a reason for hiding this comment

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

The license bot is complaining that this change is dubious. Not sure how though since the file should be generated. Perhaps there was an edit before a save?

@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 #48844 at sha d5312ce

@matanlurey matanlurey merged commit 46ff5c0 into flutter:main Dec 15, 2023
@matanlurey matanlurey deleted the engine-buildmoot-json branch December 15, 2023 04:54
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Dec 15, 2023
auto-submit bot pushed a commit to flutter/flutter that referenced this pull request Dec 15, 2023
…140198)

flutter/engine@a17bb0a...46ff5c0

2023-12-15 matanlurey@users.noreply.github.com Move `third_party/json` to `flutter/third_party/json`. (flutter/engine#48844)

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 jsimmons@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://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
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants