Update CI to use Conan 2 #5556

legleux · 2025-07-11T15:28:34Z

This is a minimally invasive update to use Conan 2 provided by our new build images also.

More refactoring of the workflows will follow soon.

Documentation update - TODO refer to Update BUILD for conan2 #5478 also
Chore (no impact to binary, e.g. .gitignore, formatting, dropping support for older tooling)

Future Tasks

Full refactor of the CI workflows and build on additional Linux distributions.

legleux

Just making some comments

conanfile.py

include/xrpl/beast/utility/rngfill.h

conan/profiles/default

codecov · 2025-07-11T16:46:44Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 78.9%. Comparing base (8aa94ea) to head (b4f361f).
Report is 1 commits behind head on develop.

Additional details and impacted files

@@            Coverage Diff            @@
##           develop   #5556     +/-   ##
=========================================
- Coverage     79.1%   78.9%   -0.1%     
=========================================
  Files          816     816             
  Lines        71653   71750     +97     
  Branches      8239    8343    +104     
=========================================
- Hits         56672   56642     -30     
- Misses       14981   15108    +127

see 108 files with indirect coverage changes

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

bthomee

This is starting to look good 🙂

I'm still looking forward to the full refactor and removal of lots of old cruft, but this is a great way to make Conan 2 available.

.github/workflows/nix.yml

conan/global.conf

conan/profiles/default

Bronek

very minor requests.

.github/workflows/nix.yml

.github/workflows/windows.yml

.github/workflows/nix.yml

bthomee · 2025-07-15T00:51:05Z

In the Build dependencies step I'm seeing the following errors:

$> Run conan remote list
conancenter: https://center2.conan.io/ [Verify SSL: True, Enabled: True]
ERROR: Remote 'ripple' can't be found or is disabled

$> Run # `conan user` implicitly uses the environment variables
'user' is not a Conan command. See 'conan --help'.

ERROR: Unknown command 'user'
outcome=failure

I think the first error is intended, due to running conan remote remove ripple || true (although it would be nice if the error could be suppressed in the future).

However, the second error seems problematic as it tries to log into the ripple remote using the command conan user --remote ripple --password, which is not supported in Conan 2 (although for some reason the remote still serves up the packages, so either logging in isn't needed as the remote is public, or logging in is done elsewhere successfully). Either way, worth taking a look.

…refactoring-1 * upstream/develop: (56 commits) Remove `include(default)` from libxrpl profile (#5587) refactor: Change boost::shared_mutex to std::shared_mutex (#5576) Fix macos runner (#5585) Remove the type filter from "ledger" RPC command (#4934) refactor: Update date, libarchive, nudb, openssl, sqlite3, xxhash packages (#5567) test: Run unit tests regardless of 'Supported' amendment status (#5537) Retire Flow Cross amendment (#5562) chore: Update CI to use Conan 2 (#5556) fixAMMClawbackRounding: adjust last holder's LPToken balance (#5513) chore: Add gcc-12 workaround (#5554) Add MPT related txns into issuer's account history (#5530) chore: Remove unused headers (#5526) fix: add allowTrustLineLocking flag for account_info (#5525) Downgrade required CMake version for Antithesis SDK (#5548) fix: Link with boost libraries explicitly (#5546) chore: Fix compilation error with clang-20 and cleanup (#5543) test: Remove circular jtx.h dependencies (#5544) Decouple CredentialHelpers from xrpld/app/tx (#5487) fix: crash when trace-logging in tests (#5529) test: switch some unit tests to doctest (#5383) ...

…actoring-2 * ximinez/lending-refactoring-1: (57 commits) Fix formatting Remove `include(default)` from libxrpl profile (#5587) refactor: Change boost::shared_mutex to std::shared_mutex (#5576) Fix macos runner (#5585) Remove the type filter from "ledger" RPC command (#4934) refactor: Update date, libarchive, nudb, openssl, sqlite3, xxhash packages (#5567) test: Run unit tests regardless of 'Supported' amendment status (#5537) Retire Flow Cross amendment (#5562) chore: Update CI to use Conan 2 (#5556) fixAMMClawbackRounding: adjust last holder's LPToken balance (#5513) chore: Add gcc-12 workaround (#5554) Add MPT related txns into issuer's account history (#5530) chore: Remove unused headers (#5526) fix: add allowTrustLineLocking flag for account_info (#5525) Downgrade required CMake version for Antithesis SDK (#5548) fix: Link with boost libraries explicitly (#5546) chore: Fix compilation error with clang-20 and cleanup (#5543) test: Remove circular jtx.h dependencies (#5544) Decouple CredentialHelpers from xrpld/app/tx (#5487) fix: crash when trace-logging in tests (#5529) ...

…actoring-3 * ximinez/lending-refactoring-2: (57 commits) Fix formatting Remove `include(default)` from libxrpl profile (#5587) refactor: Change boost::shared_mutex to std::shared_mutex (#5576) Fix macos runner (#5585) Remove the type filter from "ledger" RPC command (#4934) refactor: Update date, libarchive, nudb, openssl, sqlite3, xxhash packages (#5567) test: Run unit tests regardless of 'Supported' amendment status (#5537) Retire Flow Cross amendment (#5562) chore: Update CI to use Conan 2 (#5556) fixAMMClawbackRounding: adjust last holder's LPToken balance (#5513) chore: Add gcc-12 workaround (#5554) Add MPT related txns into issuer's account history (#5530) chore: Remove unused headers (#5526) fix: add allowTrustLineLocking flag for account_info (#5525) Downgrade required CMake version for Antithesis SDK (#5548) fix: Link with boost libraries explicitly (#5546) chore: Fix compilation error with clang-20 and cleanup (#5543) test: Remove circular jtx.h dependencies (#5544) Decouple CredentialHelpers from xrpld/app/tx (#5487) fix: crash when trace-logging in tests (#5529) ...

…actoring-4 * ximinez/lending-refactoring-3: (61 commits) fixup! Rename Transactor preflight functions Rename Transactor preflight functions fixup! Make preflight1 and preflight2 private static Transactor functions Make preflight1 and preflight2 private static Transactor functions Fix formatting Remove `include(default)` from libxrpl profile (#5587) refactor: Change boost::shared_mutex to std::shared_mutex (#5576) Fix macos runner (#5585) Remove the type filter from "ledger" RPC command (#4934) refactor: Update date, libarchive, nudb, openssl, sqlite3, xxhash packages (#5567) test: Run unit tests regardless of 'Supported' amendment status (#5537) Retire Flow Cross amendment (#5562) chore: Update CI to use Conan 2 (#5556) fixAMMClawbackRounding: adjust last holder's LPToken balance (#5513) chore: Add gcc-12 workaround (#5554) Add MPT related txns into issuer's account history (#5530) chore: Remove unused headers (#5526) fix: add allowTrustLineLocking flag for account_info (#5525) Downgrade required CMake version for Antithesis SDK (#5548) fix: Link with boost libraries explicitly (#5546) ...

…actoring-4 * ximinez/lending-refactoring-3: (61 commits) fixup! Rename Transactor preflight functions Rename Transactor preflight functions fixup! Make preflight1 and preflight2 private static Transactor functions Make preflight1 and preflight2 private static Transactor functions Fix formatting Remove `include(default)` from libxrpl profile (#5587) refactor: Change boost::shared_mutex to std::shared_mutex (#5576) Fix macos runner (#5585) Remove the type filter from "ledger" RPC command (#4934) refactor: Update date, libarchive, nudb, openssl, sqlite3, xxhash packages (#5567) test: Run unit tests regardless of 'Supported' amendment status (#5537) Retire Flow Cross amendment (#5562) chore: Update CI to use Conan 2 (#5556) fixAMMClawbackRounding: adjust last holder's LPToken balance (#5513) chore: Add gcc-12 workaround (#5554) Add MPT related txns into issuer's account history (#5530) chore: Remove unused headers (#5526) fix: add allowTrustLineLocking flag for account_info (#5525) Downgrade required CMake version for Antithesis SDK (#5548) fix: Link with boost libraries explicitly (#5546) ... Co-authored-by: Bronek Kozicki <[email protected]>

legleux commented Jul 11, 2025

View reviewed changes

conanfile.py Show resolved Hide resolved

conanfile.py Show resolved Hide resolved

conanfile.py Show resolved Hide resolved

Bronek reviewed Jul 11, 2025

View reviewed changes

include/xrpl/beast/utility/rngfill.h Show resolved Hide resolved

Bronek reviewed Jul 11, 2025

View reviewed changes

conan/profiles/default Show resolved Hide resolved

legleux changed the title ~~Update CI to use Conan 2~~ [DRAFT] Update CI to use Conan 2 Jul 11, 2025

legleux marked this pull request as ready for review July 11, 2025 16:20

legleux marked this pull request as draft July 11, 2025 19:09

legleux added the DraftRunCI Normally CI does not run on draft PRs. This opts in. label Jul 11, 2025

legleux force-pushed the legleux/conan2 branch from 4521cef to ad1a086 Compare July 11, 2025 19:21

bthomee reviewed Jul 11, 2025

View reviewed changes

.github/workflows/nix.yml Outdated Show resolved Hide resolved

.github/workflows/nix.yml Outdated Show resolved Hide resolved

conan/global.conf Outdated Show resolved Hide resolved

conan/profiles/default Show resolved Hide resolved

Bronek mentioned this pull request Jul 14, 2025

Trying to fix gcc-12 errors #5560

Merged

13 tasks

legleux and others added 2 commits July 14, 2025 10:05

Update CI to use Conan 2

b88b75d

Trying to fix gcc-12 errors (#5560)

2e5ecf8

legleux force-pushed the legleux/conan2 branch 2 times, most recently from a45b200 to 2e5ecf8 Compare July 14, 2025 17:14

Bronek requested changes Jul 14, 2025

View reviewed changes

.github/workflows/nix.yml Outdated Show resolved Hide resolved

.github/workflows/nix.yml Outdated Show resolved Hide resolved

bthomee reviewed Jul 14, 2025

View reviewed changes

.github/workflows/nix.yml Show resolved Hide resolved

.github/workflows/windows.yml Show resolved Hide resolved

legleux marked this pull request as ready for review July 14, 2025 19:58

legleux changed the title ~~[DRAFT] Update CI to use Conan 2~~ Update CI to use Conan 2 Jul 14, 2025

legleux added 2 commits July 14, 2025 14:19

PR comments

8171a9f

cat to correct location

6edb927

legleux requested a review from Bronek July 14, 2025 21:24

bthomee reviewed Jul 14, 2025

View reviewed changes

.github/workflows/nix.yml Outdated Show resolved Hide resolved

cat -> echo

5e1e665

Bronek approved these changes Jul 15, 2025

View reviewed changes

legleux added 2 commits July 15, 2025 11:39

try to fix conan auth

4b5c4af

pin all versions

87ad989

bthomee approved these changes Jul 15, 2025

View reviewed changes

add remotes for non-nix

b4f361f

bthomee enabled auto-merge (squash) July 15, 2025 21:41

bthomee merged commit 452263e into develop Jul 15, 2025
27 checks passed

bthomee deleted the legleux/conan2 branch July 15, 2025 22:17

This was referenced Aug 27, 2025

Release 2.6.0 #5741

Merged

Release 2.6.0 #5742

Merged

mvadari mentioned this pull request Oct 14, 2025

update conanfile.py for conan2 (Version: 2.2.0) #4990

Closed

Update CI to use Conan 2 #5556

Update CI to use Conan 2 #5556

Uh oh!

Conversation

legleux commented Jul 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Future Tasks

Uh oh!

legleux left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

codecov bot commented Jul 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

bthomee left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Bronek left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

bthomee commented Jul 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

legleux commented Jul 11, 2025 •

edited

Loading

codecov bot commented Jul 11, 2025 •

edited

Loading

bthomee commented Jul 15, 2025 •

edited

Loading