Skip to content

ci: use cargo sort v2#6406

Merged
yihau merged 2 commits intoanza-xyz:masterfrom
yihau:use-cargo-sort-v2
Jun 6, 2025
Merged

ci: use cargo sort v2#6406
yihau merged 2 commits intoanza-xyz:masterfrom
yihau:use-cargo-sort-v2

Conversation

@yihau
Copy link
Copy Markdown
Member

@yihau yihau commented Jun 4, 2025

Problem

context: https://discord.com/channels/428295358100013066/560503042458517505/1379599822767788043

cargo sort v2 was released ~2 weeks ago and does a decent job at sorting

Summary of Changes

  • update our ci docker image
  • run ./scripts/cargo-for-all-lock-files.sh -- sort --workspace and commit

@yihau yihau marked this pull request as ready for review June 4, 2025 08:52
@yihau yihau requested review from a team as code owners June 4, 2025 08:52
@yihau yihau requested a review from t-nelson June 4, 2025 08:52
@codecov-commenter
Copy link
Copy Markdown

codecov-commenter commented Jun 4, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 82.8%. Comparing base (de54ce0) to head (fa391e6).

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #6406   +/-   ##
=======================================
  Coverage    82.8%    82.8%           
=======================================
  Files         848      848           
  Lines      379479   379479           
=======================================
+ Hits       314461   314482   +21     
+ Misses      65018    64997   -21     
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@t-nelson
Copy link
Copy Markdown

t-nelson commented Jun 4, 2025

looks great, thanks! can we hold for #6351? it'll be easier to rerun cargo sort on that to resolve here, than resolve conflicts the mess i made over there

@t-nelson
Copy link
Copy Markdown

t-nelson commented Jun 4, 2025

just landed #6351

@yihau yihau force-pushed the use-cargo-sort-v2 branch from ef15dc4 to 482ba4f Compare June 4, 2025 16:52
t-nelson
t-nelson previously approved these changes Jun 4, 2025
@t-nelson
Copy link
Copy Markdown

t-nelson commented Jun 4, 2025

@mergify rebase

@mergify
Copy link
Copy Markdown

mergify Bot commented Jun 4, 2025

rebase

❌ Base branch update has failed

Details

t-nelson token is invalid, make sure t-nelson can still log in on the Mergify dashboard.

@t-nelson
Copy link
Copy Markdown

t-nelson commented Jun 4, 2025

@mergify rebase

@mergify
Copy link
Copy Markdown

mergify Bot commented Jun 4, 2025

rebase

❌ Base branch update has failed

Details

t-nelson token is invalid, make sure t-nelson can still log in on the Mergify dashboard.

@t-nelson
Copy link
Copy Markdown

t-nelson commented Jun 4, 2025

here's the conflict resolution. can't push to your remote

diff --git a/Cargo.toml b/Cargo.toml
index a8cb66321b..bd2265b1a1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,22 +1,3 @@
-<<<<<<< HEAD
-[profile.release-with-debug]
-inherits = "release"
-debug = true
-strip = false
-split-debuginfo = "off"
-
-[profile.release]
-split-debuginfo = "unpacked"
-lto = "thin"
-
-[profile.release-with-lto]
-inherits = "release"
-split-debuginfo = "unpacked"
-lto = "thin"
-codegen-units = 1
-=======
->>>>>>> 482ba4f4eb (cargo sort)
-
 [workspace]
 members = [
     "account-decoder",
@@ -630,11 +611,12 @@ x509-parser = "0.14.0"
 # See "zeroize versioning issues" below if you are updating this version.
 zeroize = { version = "1.7", default-features = false }
 zstd = "0.13.3"
+
 [profile.release-with-debug]
 inherits = "release"
 debug = true
-split-debuginfo = "packed"
-lto = false                # Preserve the 'thin local LTO' for this build.
+strip = false
+split-debuginfo = "off"
 
 [profile.release]
 split-debuginfo = "unpacked"

@sakridge
Copy link
Copy Markdown

sakridge commented Jun 5, 2025

Update the readme with the new dependency and instructions?

Copy link
Copy Markdown

@tao-stones tao-stones left a comment

Choose a reason for hiding this comment

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

lgtm for tx-metadata

@yihau
Copy link
Copy Markdown
Member Author

yihau commented Jun 6, 2025

@sakridge I’m not aware that we document any cargo sort info in our codebase. when you get a chance, could you point me to where that's mentioned. btw, I think it's like an improvement. we can address in a separate PR 🫡

@yihau yihau merged commit 103fb21 into anza-xyz:master Jun 6, 2025
49 of 58 checks passed
@yihau yihau deleted the use-cargo-sort-v2 branch June 6, 2025 03:09
mircea-c pushed a commit to mircea-c/agave that referenced this pull request Jun 12, 2025
* ci: install cargo-sort v2

* cargo sort
mircea-c added a commit to mircea-c/agave that referenced this pull request Jun 12, 2025
* ci: install cargo-sort v2

* cargo sort
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.

6 participants