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

[tool] Fix third_party dependency overrides #7966

Merged

Conversation

stuartmorgan
Copy link
Contributor

made-deps-path-based would sometimes create invalid relative paths when third_party/packages was involved because it was using the sibling directory of packages as the base. This updates the logic to always make the paths relative to the repository root; this is often a longer relative path than necessary, but that's harmless, and always using the repo root makes it easier to reason about.

Also fixes the fact that paths that were already path based (which is always the case for some_package/example's dependency on some_package) were being overridden, causing CI to do some unnecessary duplicate analysis work.

`made-deps-path-based` would sometimes create invalid relative paths
when `third_party/packages` was involved because it was using the
sibling directory of `packages` as the base. This updates the logic to
always make the paths relative to the repository root; this is sometimes
longer than necessary, but that's harmless, and always using the repo
root makes it easier to reason about.

Also fixes the fact that paths that were already path based (which is
always the case for `some_package/example`'s dependency on
`some_package`) were being overridden, causing CI to do some unnecessary
duplicate analysis work.
@stuartmorgan stuartmorgan added the autosubmit Merge PR when tree becomes green via auto submit App label Oct 30, 2024
@auto-submit auto-submit bot merged commit 030dd4e into flutter:main Oct 30, 2024
76 checks passed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Oct 31, 2024
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Oct 31, 2024
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Nov 1, 2024
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Nov 1, 2024
auto-submit bot pushed a commit to flutter/flutter that referenced this pull request Nov 1, 2024
flutter/packages@7cc1caa...796afa3

2024-11-01 [email protected] [google_maps_flutter] Update Android for non-nullable generics (flutter/packages#7990)
2024-11-01 [email protected] [various] Minor cleanup in recently imported packages (flutter/packages#7995)
2024-11-01 [email protected] [go_router] Update example app to Kotlin 1.9.0 (flutter/packages#7997)
2024-10-31 [email protected] Manual roll Flutter from fe71cad to 0fe6153 (18 revisions) (flutter/packages#7989)
2024-10-31 [email protected] [vector_garphics] fix execution on the web with WebAssembly (flutter/packages#7991)
2024-10-31 49699333+dependabot[bot]@users.noreply.github.com [url_launcher]: Bump androidx.annotation:annotation from 1.9.0 to 1.9.1 in /packages/url_launcher/url_launcher_android/android (flutter/packages#7986)
2024-10-31 [email protected] [flutter_svg] Initial import (flutter/packages#7944)
2024-10-31 [email protected] [vector_graphics] Initial import (flutter/packages#7941)
2024-10-30 [email protected] [ci] Ensure repo tool is autoformatted (flutter/packages#7963)
2024-10-30 [email protected] Updates path_parsing README.md with a note about Dan (flutter/packages#7949)
2024-10-30 [email protected] [tool] Support third_party for --current-package (flutter/packages#7967)
2024-10-30 [email protected] [tool] Fix third_party dependency overrides (flutter/packages#7966)
2024-10-30 [email protected] Applied Gradle Plugins Declaratively for `path_provider` (flutter/packages#7822)
2024-10-30 [email protected] [palette_generator] Remove unmanaged code snippet (flutter/packages#7962)
2024-10-30 [email protected] Roll Flutter from 42132e8 to fe71cad (12 revisions) (flutter/packages#7961)

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-flutter-autoroll
Please CC [email protected] 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 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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants