Skip to content

Conversation

@auto-submit
Copy link
Contributor

@auto-submit auto-submit bot commented May 26, 2025

Reverts: #169451

Initiated by: matanlurey

Reason for reverting: Broke a number of post-submit tests (ios_app_extension, packages_autoroller).

Original PR Author: mosuem

Reviewed By: {matanlurey}

This change reverts the following previous change:
Reland after #169357.

Switch Flutter to use pub workspaces as a preparation to unpin selected packages.

Assumptions:

  1. No packages in this repository are published to pub.dev --> We can use any dependencies in most local pubspecs, as the global constraint defines the version. An exception are the packages used outside of this repo with an sdk dependency, namely flutter_localizations, flutter_test, and flutter.
  2. The "universes" {flutter_tools} and {flutter, flutter_localizations, flutter_goldens} can use different packages versions, as they are not resolved together. --> We do not need to upgrade them in sync, we can first do one "universe", then the other.

Based on these assumptions, we use https://github.com/mosuem/pubspec_merger.dart to merge all packages in the flutter universe into a top-level pub workspace.

The flutter and flutter_tools workspaces being separate also ensures that changes to flutter will not inadvertently break flutter_tools, with not-so-nice consequences for our users which would be unable to run flutter upgrade.

There is a third "top-level" pubspec besides ./pubspec.yaml and packages/flutter_tools/pubspec.yaml, namely packages/flutter_tools/.../widget_preview_scaffold/pubspec.yaml. This is an artifact due to it living under flutter_tools, so it can't be part of the ./pubspec.yaml workspace. Moving it would be a larger change, and out of the scope of this PR.

This required a rewrite of the update-packages tool, but the main functionality stays the same, as well as the argument names, to ensure a seamless transition.

Pre-launch Checklist

If you need help, consider asking for advice on the #hackers-new channel on Discord.

@auto-submit auto-submit bot requested a review from matanlurey as a code owner May 26, 2025 14:06
@auto-submit auto-submit bot added the revert of Bot Only: Tracking label for bot. Tracks new revert of pull requests. label May 26, 2025
@github-actions github-actions bot added a: tests "flutter test", flutter_test, or one of our tests tool Affects the "flutter" command-line tool. See also t: labels. framework flutter/packages/flutter repository. See also f: labels. a: internationalization Supporting other languages or locales. (aka i18n) d: api docs Issues with https://api.flutter.dev/ d: examples Sample code and demos team-infra Owned by Infrastructure team f: integration_test The flutter/packages/integration_test plugin d: docs/ flutter/flutter/docs, for contributors labels May 26, 2025
@auto-submit auto-submit bot added this pull request to the merge queue May 26, 2025
Merged via the queue into master with commit 4372bfb May 26, 2025
9 of 12 checks passed
@auto-submit auto-submit bot deleted the revert_3a0897a3362d5fccef6c6b9d0430624e4878758b branch May 26, 2025 14:37
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 26, 2025
auto-submit bot pushed a commit to flutter/packages that referenced this pull request May 26, 2025
flutter/flutter@60050a0...4372bfb

2025-05-26 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Add workspace (#169451)" (flutter/flutter#169468)
2025-05-26 [email protected] Add workspace (flutter/flutter#169451)
2025-05-26 [email protected] Fix wrong path in 'archives' for release mode iOS DDM artifacts. (flutter/flutter#169448)
2025-05-26 [email protected] Roll Fuchsia Linux SDK from -eo2JqnJBauuGSzoW... to 5mpmPsuD8rpeiJizT... (flutter/flutter#169446)
2025-05-25 [email protected] Roll Fuchsia Linux SDK from XtPp9bBW49iDJ0wbA... to -eo2JqnJBauuGSzoW... (flutter/flutter#169424)
2025-05-24 [email protected] Roll Skia from 91dc88dc70e5 to 443f5257f382 (1 revision) (flutter/flutter#169422)

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
Please CC [email protected],[email protected] on the revert to ensure that a human
is aware of the problem.

To file a bug in Packages: 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
stan-at-work pushed a commit to stan-at-work/flutter that referenced this pull request May 26, 2025
<!-- start_original_pr_link -->
Reverts: flutter#169451
<!-- end_original_pr_link -->
<!-- start_initiating_author -->
Initiated by: matanlurey
<!-- end_initiating_author -->
<!-- start_revert_reason -->
Reason for reverting: Broke a number of post-submit tests
(ios_app_extension, packages_autoroller).
<!-- end_revert_reason -->
<!-- start_original_pr_author -->
Original PR Author: mosuem
<!-- end_original_pr_author -->

<!-- start_reviewers -->
Reviewed By: {matanlurey}
<!-- end_reviewers -->

<!-- start_revert_body -->
This change reverts the following previous change:
Reland after flutter#169357.

Switch Flutter to use pub workspaces as a preparation to unpin selected
packages.

Assumptions:

1. No packages in this repository are published to pub.dev --> We can
use `any` dependencies in most local pubspecs, as the global constraint
defines the version. An exception are the packages used outside of this
repo with an `sdk` dependency, namely `flutter_localizations`,
`flutter_test`, and `flutter`.
2. The "universes" `{flutter_tools}` and `{flutter,
flutter_localizations, flutter_goldens}` can use different packages
versions, as they are not resolved together. --> We do not need to
upgrade them in sync, we can first do one "universe", then the other.

Based on these assumptions, we use
https://github.com/mosuem/pubspec_merger.dart to merge all packages in
the `flutter` universe into a top-level pub workspace.

The `flutter` and `flutter_tools` workspaces being separate also ensures
that changes to `flutter` will not inadvertently break `flutter_tools`,
with not-so-nice consequences for our users which would be unable to run
`flutter upgrade`.

There is a third "top-level" pubspec besides `./pubspec.yaml` and
`packages/flutter_tools/pubspec.yaml`, namely
`packages/flutter_tools/.../widget_preview_scaffold/pubspec.yaml`. This
is an artifact due to it living under `flutter_tools`, so it can't be
part of the `./pubspec.yaml` workspace. Moving it would be a larger
change, and out of the scope of this PR.

This required a rewrite of the update-packages tool, but the main
functionality stays the same, as well as the argument names, to ensure a
seamless transition.

## Pre-launch Checklist

- [x] I read the [Contributor Guide] and followed the process outlined
there for submitting PRs.
- [x] I read the [Tree Hygiene] wiki page, which explains my
responsibilities.
- [x] I read and followed the [Flutter Style Guide], including [Features
we expect every widget to implement].
- [x] I signed the [CLA].
- [x] I listed at least one issue that this PR fixes in the description
above.
- [x] I updated/added relevant documentation (doc comments with `///`).
- [x] I added new tests to check the change I am making, or this PR is
[test-exempt].
- [x] I followed the [breaking change policy] and added [Data Driven
Fixes] where supported.
- [x] All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel
on [Discord].

<!-- Links -->
[Contributor Guide]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview
[Tree Hygiene]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md
[test-exempt]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests
[Flutter Style Guide]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md
[Features we expect every widget to implement]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement
[CLA]: https://cla.developers.google.com/
[flutter/tests]: https://github.com/flutter/tests
[breaking change policy]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes
[Discord]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md
[Data Driven Fixes]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md

<!-- end_revert_body -->

Co-authored-by: auto-submit[bot] <[email protected]>
FMorschel pushed a commit to FMorschel/packages that referenced this pull request Jun 9, 2025
…#9322)

flutter/flutter@60050a0...4372bfb

2025-05-26 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Add workspace (#169451)" (flutter/flutter#169468)
2025-05-26 [email protected] Add workspace (flutter/flutter#169451)
2025-05-26 [email protected] Fix wrong path in 'archives' for release mode iOS DDM artifacts. (flutter/flutter#169448)
2025-05-26 [email protected] Roll Fuchsia Linux SDK from -eo2JqnJBauuGSzoW... to 5mpmPsuD8rpeiJizT... (flutter/flutter#169446)
2025-05-25 [email protected] Roll Fuchsia Linux SDK from XtPp9bBW49iDJ0wbA... to -eo2JqnJBauuGSzoW... (flutter/flutter#169424)
2025-05-24 [email protected] Roll Skia from 91dc88dc70e5 to 443f5257f382 (1 revision) (flutter/flutter#169422)

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
Please CC [email protected],[email protected] on the revert to ensure that a human
is aware of the problem.

To file a bug in Packages: 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
Ortes pushed a commit to Ortes/packages that referenced this pull request Jun 25, 2025
…#9322)

flutter/flutter@60050a0...4372bfb

2025-05-26 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Add workspace (#169451)" (flutter/flutter#169468)
2025-05-26 [email protected] Add workspace (flutter/flutter#169451)
2025-05-26 [email protected] Fix wrong path in 'archives' for release mode iOS DDM artifacts. (flutter/flutter#169448)
2025-05-26 [email protected] Roll Fuchsia Linux SDK from -eo2JqnJBauuGSzoW... to 5mpmPsuD8rpeiJizT... (flutter/flutter#169446)
2025-05-25 [email protected] Roll Fuchsia Linux SDK from XtPp9bBW49iDJ0wbA... to -eo2JqnJBauuGSzoW... (flutter/flutter#169424)
2025-05-24 [email protected] Roll Skia from 91dc88dc70e5 to 443f5257f382 (1 revision) (flutter/flutter#169422)

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
Please CC [email protected],[email protected] on the revert to ensure that a human
is aware of the problem.

To file a bug in Packages: 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
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 14, 2025
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 14, 2025
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 15, 2025
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 15, 2025
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 16, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

a: internationalization Supporting other languages or locales. (aka i18n) a: tests "flutter test", flutter_test, or one of our tests d: api docs Issues with https://api.flutter.dev/ d: docs/ flutter/flutter/docs, for contributors d: examples Sample code and demos f: integration_test The flutter/packages/integration_test plugin framework flutter/packages/flutter repository. See also f: labels. revert of Bot Only: Tracking label for bot. Tracks new revert of pull requests. team-infra Owned by Infrastructure team tool Affects the "flutter" command-line tool. See also t: labels.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants