Skip to content

v2.2: bump cargo sort to v2#6582

Merged
steviez merged 2 commits intoanza-xyz:v2.2from
yihau:v2.2-sort-v2
Jun 19, 2025
Merged

v2.2: bump cargo sort to v2#6582
steviez merged 2 commits intoanza-xyz:v2.2from
yihau:v2.2-sort-v2

Conversation

@yihau
Copy link
Copy Markdown
Member

@yihau yihau commented Jun 13, 2025

Problem

we use bump cargo sort to v2 on master: #6406. the inconsistent versions in v2.2 and v2.3 will make backporting very painful

Summary of Changes

  • update the docker image
  • ./scripts/cargo-for-all-lock-files.sh -- sort --workspace

@yihau yihau marked this pull request as ready for review June 13, 2025 19:19
@yihau yihau requested a review from a team as a code owner June 13, 2025 19:19
@yihau yihau requested review from steviez and t-nelson June 13, 2025 19:22
@codecov-commenter
Copy link
Copy Markdown

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 83.4%. Comparing base (6a90906) to head (da0f3a0).

Additional details and impacted files
@@           Coverage Diff            @@
##             v2.2    #6582    +/-   ##
========================================
  Coverage    83.3%    83.4%            
========================================
  Files         807      807            
  Lines      373498   373498            
========================================
+ Hits       311471   311624   +153     
+ Misses      62027    61874   -153     
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

Copy link
Copy Markdown

@steviez steviez left a comment

Choose a reason for hiding this comment

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

I think we should probably hold off on the v2.2 version of this until we get crates building on the branch again. We might need to BP some of the use-individual-sdk-crate changes, and this would assuredly create merge conflicts with that

Copy link
Copy Markdown

@steviez steviez left a comment

Choose a reason for hiding this comment

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

LGTM and confirmed just the version bump + all Cargo.toml changes

Comment thread ci/docker/Dockerfile
# cargo install cargo-hack && \
cargo install --git https://github.com/anza-xyz/cargo-hack.git --rev 5e59c3ec6c661c02601487c0d4b2a2649fe06c9f cargo-hack && \
cargo install cargo-sort && \
cargo install cargo-sort@^2 && \
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Non Cargo.toml change

@steviez steviez merged commit 0212791 into anza-xyz:v2.2 Jun 19, 2025
46 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants