Skip to content

v2.3: bump cargo sort to v2#6583

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

v2.3: bump cargo sort to v2#6583
steviez merged 2 commits intoanza-xyz:v2.3from
yihau:v2.3-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
@steviez
Copy link
Copy Markdown

steviez commented Jun 13, 2025

Was there a reason for not just applying the v2.3 label to #6406 ?

@yihau
Copy link
Copy Markdown
Member Author

yihau commented Jun 13, 2025

I guess we must have some conflicts here, so just do it separately. 🫠

@codecov-commenter
Copy link
Copy Markdown

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 82.8%. Comparing base (de5e339) to head (1fa0c92).
Report is 1 commits behind head on v2.3.

Additional details and impacted files
@@            Coverage Diff            @@
##             v2.3    #6583     +/-   ##
=========================================
- Coverage    82.8%    82.8%   -0.1%     
=========================================
  Files         848      848             
  Lines      379552   379552             
=========================================
- Hits       314532   314522     -10     
- Misses      65020    65030     +10     
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@steviez
Copy link
Copy Markdown

steviez commented Jun 17, 2025

I guess we must have some conflicts here, so just do it separately. 🫠

I just tried it and 3 files conflicted. The pros of the BP label is that I can "lean more heavily" on the initial review, although that also somewhat assumes that someone diligently looked at the initial one.

We can probably trust the automation on this one; I'll skim this with fresh eyes in the morning

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.

Hopefully our rate of BP PR's and people needing to actively develop on this branch declines, but should help reduce some friction so I'm good with it

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.

Confirmed that this is the only non Cargo.toml change

@steviez steviez merged commit 2e7c31e into anza-xyz:v2.3 Jun 18, 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