Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/flutter_tools/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ dependencies:
http_multi_server: 3.2.1
convert: 3.1.1
async: 2.11.0
unified_analytics: 5.8.8
unified_analytics: 5.8.8+1
Copy link
Contributor

Choose a reason for hiding this comment

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

FYI @eliasyishak we're rolled on master

Copy link
Contributor

Choose a reason for hiding this comment

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

Can we apply the cp label to this PR then?

Copy link
Contributor

Choose a reason for hiding this comment

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

No, the bot will just use git cherry-pick <SHA>, which will either fail from a merge conflict or just take the checksum from here as is. You will need to follow https://github.com/flutter/flutter/wiki/Updating-dependencies-in-Flutter#to-update-a-single-dependency-for-cherrypicks to update the version but also generate a correct checksum.

Copy link
Contributor

Choose a reason for hiding this comment

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

So does the workflow look like the following for CPs into beta that update just one dependency:

  1. Checkout the latest beta candidate branch, flutter-3.22-candidate.0 in this case
  2. Create a separate branch to merge into beta branch, hotfix-unified-analytics-5.8.8+1
  3. Run flutter update-packages --cherry-pick-package=unified_analytics --cherry-pick-version='5.8.8+1' and get the updated checksum
  4. Open a PR into beta?

Copy link
Contributor

Choose a reason for hiding this comment

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

Everything but the fourth step--your PR should target the candidate branch.

Copy link
Contributor

Choose a reason for hiding this comment

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

oops, i meant to put the candidate branch there, but sounds good, i've opened it up here: #146948


cli_config: 0.2.0
graphs: 2.3.1
Expand Down Expand Up @@ -120,4 +120,4 @@ dartdoc:
# Exclude this package from the hosted API docs.
nodoc: true

# PUBSPEC CHECKSUM: ba25
# PUBSPEC CHECKSUM: 8b81