ci: migrate GitHub Actions to cargo rbmt by satsfy · Pull Request #540 · rust-bitcoin/corepc

satsfy · 2026-04-07T21:30:37Z

Fixes #538

This PR migrates the CI workflow from the maintainer-tools shell entrypoints to cargo rbmt, joins Stable/Nightly/MSRV test jobs into a single toolchain/lockfile matrix and makes the supporting library changes needed for checks to pass cleanly.

Summary:

gate async TLS code on the async feature in bitreq
fix the webpki-roots cfg name in bitreq
add workspace and per-crate rbmt metadata
migrate rust.yaml to cargo rbmt
rename lint-integtation-tests.sh to lint-integration-tests.sh

tcharding

ACK 1ddbb2b

tcharding · 2026-04-08T05:48:38Z

Thanks man, top effort! @nyonson if you get a second could you take a look at this please?

tnull · 2026-04-08T07:11:00Z

bitreq/src/url.rs

    pub fn as_str(&self) -> &str { &self.serialization }

    /// Returns `true` if the URL scheme is "https" or "wss".
+    #[allow(dead_code)]


I think we currently only use this when

#[cfg(all(feature = "proxy", feature = "std"))]

Please apply the same cfg-gate here rather than allowing dead code.

Nice, I changed the config gate. But those methods are used in std builds even without proxy. If I remove the proxy it causes CI errors. So I replaced #[allow(dead_code)] with #[cfg(feature = "std")].

tnull · 2026-04-08T07:11:52Z

bitreq/src/url.rs

    ///
    /// The returned string includes the leading `/` (if present) and the `?`
    /// separator (if there's a query string). Returns "/" if the path is empty.
+    #[allow(dead_code)]


Same here, this is only used when std, so please cfg-gate on that rather than allowing dead code.

Replaced #[allow(dead_code)] with #[cfg(feature = "std")] here too.

bitreq/src/connection/rustls_stream.rs

clippy.toml

tnull · 2026-04-08T07:22:45Z

.github/workflows/rust.yaml

      fail-fast: false
      matrix:
        dep: [minimal, recent]
+        toolchain: [stable, nightly, msrv]


Where is the msrv toolchain defined? While a global MSRV might work out right now, I'm not sure this will always be the case as bitreq's TLS dependencies might for example bump MSRV at some point. Would the entire ecosystem / all crates then fine with bumping MSRV, even if they don't share the same dependencies?

cc @nyonson, do you remember if [workspace.metadata.rbmt.toolchains] can be overridden with crate-specific config?

The msrv is implicitly picked up from the rust-version keys in the package manifests. As of today, cargo-rbmt has a limitation where it only works in workspaces with 1 msrv. This can be fixed if needed, just a bit of complexity which hasn't been necessary.

cc @nyonson, do you remember if [workspace.metadata.rbmt.toolchains] can be overridden with crate-specific config?

I was planning to migrate Floresta to cargo-rbmt soon. This would be handy, since the lib crates probably have lower MSRV than the binary itself.

Thanks for the discussion. For this PR, this is effectively a no-op. I’m happy to follow up with per-crate msrv support once we need it, or once cargo-rbmt supports it.

Trackin it over here: https://git.rust-bitcoin.org/rust-bitcoin/rust-bitcoin-maintainer-tools/issues/119

Cargo.toml

nyonson · 2026-04-09T15:26:04Z

.github/workflows/rust.yaml

      fail-fast: false
      matrix:
        dep: [minimal, recent]
+        toolchain: [stable, nightly, msrv]


FWIW I am not sure how valuable testing on the nighlty toolchain is, but doesn't hurt either. Some recent discussion over here: rust-bitcoin/rust-psbt#87 (comment)

This PR aims to not modify the previous CI job list, which included nightly. I suppose nightly is here as early warning for upcoming compiler or toolchain changes.

.github/workflows/rust.yaml

nyonson · 2026-04-09T15:34:03Z

.github/workflows/rust.yaml

        run: |
-          ./maintainer-tools/ci/run_task.sh lint
-          ./contrib/lint-integtation-tests.sh
+          cargo rbmt --lock-file ${{ matrix.dep }} lint \


Just curious for feedback on rbmt, does the fuzz package not play nice here?

package jsonrpc-fuzz is included and works with rbmt ok from what I've seen.

nyonson

ACK: fff9fcf

rbmt stuff looks good to me! I don't have context on the other stuff.

Add workspace and per-crate rbmt configuration needed to drive the new CI tasks. Record the rbmt toolchain and integration metadata, teach lint about expected duplicate dependencies in selected crates, and remove the old clippy msrv setting now that toolchain metadata lives in rbmt configuration.

luisschwab · 2026-04-09T16:47:01Z

Just need to fix the lint CI error, otherwise LGTM

Migrate the GitHub Actions workflow from the maintainer-tools shell entrypoints to cargo rbmt. Read the pinned rbmt version from the repository, consolidate the Stable/Nightly/MSRV test jobs into a single toolchain/lockfile matrix, and scope test and lint runs to the packages that build without a bitcoind version feature. Fix the misspelled lint-integtation-tests.sh script name in the workflow and justfile.

Add `#[cfg(feature = "std")]` to URL helper methods used only in std builds.

Rename contrib/lint-integtation-tests.sh to lint-integration-tests.sh and update the justfile reference to match.

satsfy · 2026-04-09T18:59:30Z

Addressed all review comments after the force-pushes and cut a fair amount of LOC.

satsfy requested review from TheBlueMatt, jamillambert, oleonardolima, tcharding and tnull as code owners April 7, 2026 21:30

github-actions bot added C-client C-node labels Apr 7, 2026

tcharding previously approved these changes Apr 8, 2026

View reviewed changes

tnull reviewed Apr 8, 2026

View reviewed changes

luisschwab suggested changes Apr 9, 2026

View reviewed changes

Cargo.toml Outdated Show resolved Hide resolved

satsfy added a commit to satsfy/corepc that referenced this pull request Apr 9, 2026

Add REVIEW.md with PR rust-bitcoin#540 review responses and changelog

72982c6

satsfy added a commit to satsfy/corepc that referenced this pull request Apr 9, 2026

Add REVIEW.md with PR rust-bitcoin#540 review responses and changelog

d5c9435

satsfy added a commit to satsfy/corepc that referenced this pull request Apr 9, 2026

Add REVIEW.md with PR rust-bitcoin#540 review responses and changelog

481ee11

satsfy dismissed tcharding’s stale review via 72982c6 April 9, 2026 14:48

satsfy force-pushed the rbmt-migration branch from 72982c6 to fff9fcf Compare April 9, 2026 14:54

nyonson reviewed Apr 9, 2026

View reviewed changes

.github/workflows/rust.yaml Outdated Show resolved Hide resolved

nyonson reviewed Apr 9, 2026

View reviewed changes

satsfy force-pushed the rbmt-migration branch from fff9fcf to a77e850 Compare April 9, 2026 16:47

satsfy added 3 commits April 9, 2026 15:05

bitreq: cfg-gate std-only URL helpers

569b87e

Add `#[cfg(feature = "std")]` to URL helper methods used only in std builds.

ci: rename misspelled lint script

0e2d336

Rename contrib/lint-integtation-tests.sh to lint-integration-tests.sh and update the justfile reference to match.

satsfy force-pushed the rbmt-migration branch from a77e850 to 0e2d336 Compare April 9, 2026 18:06

satsfy requested review from luisschwab and tcharding April 9, 2026 18:59

satsfy requested a review from tnull April 9, 2026 18:59

Conversation

satsfy commented Apr 7, 2026

Uh oh!

tcharding left a comment

Choose a reason for hiding this comment

Uh oh!

tcharding commented Apr 8, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

satsfy Apr 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

nyonson left a comment

Choose a reason for hiding this comment

Uh oh!

luisschwab commented Apr 9, 2026

Uh oh!

satsfy commented Apr 9, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

satsfy Apr 9, 2026 •

edited

Loading