Skip to content

Commit

Permalink
Use the v3 resolver for msrv compliant versoins
Browse files Browse the repository at this point in the history
  • Loading branch information
nyonson committed Nov 25, 2024
1 parent 015a8e4 commit 30de612
Show file tree
Hide file tree
Showing 4 changed files with 48 additions and 47 deletions.
1 change: 0 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ on:
pull_request:

jobs:
# Proxy application is not as strict as protocol library.
proxy:
runs-on: ubuntu-latest
strategy:
Expand Down
84 changes: 39 additions & 45 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
[workspace]
members = ["protocol", "proxy"]
# Resolving transitive dependencies which are MSRV compliant with resolver v3,
# but the v3 resolver is only available in rustc > 1.84.0.
#
# 1. Update workspace resolver setting to `3`.
# 2. Hop over to a toolchain with rust version > 1.84.0.
# 3. Run `cargo update` to fix up lock file versions.
# 4. Set workspace resolver setting back to `2` to support MSRV.
#
# Once MSRV > 1.84.0 this setting can be dropped since the default is then v3.
resolver = "2"
1 change: 0 additions & 1 deletion proxy/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ license-file = "LICENSE"
description = "BIP324 proxy enabling v1-only clients to use the v2 Bitcoin P2P Protocol"
repository = "https://github.com/rust-bitcoin/bip324"
readme = "README.md"
rust-version = "1.63.0"

[package.metadata.configure_me]
spec = "config_spec.toml"
Expand Down

0 comments on commit 30de612

Please sign in to comment.