Skip to content
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/cont_integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
- name: Build
run: cargo build --features ${{ matrix.features }} --no-default-features
- name: Test
run: cargo test --features ${{ matrix.features }} --no-default-features -- --test-threads=1
run: cargo test --features ${{ matrix.features }} --no-default-features -- --test-threads=16

fmt:
name: Rust Formatting
Expand Down
1 change: 0 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ tokio = { version = "1", features = ["time"], optional = true }
[dev-dependencies]
tokio = { version = "1.20.1", features = ["full"] }
electrsd = { version = "0.36.1", features = ["legacy", "esplora_a33e97e1", "corepc-node_29_0"] }
lazy_static = "1.4.0"

[features]
default = ["blocking", "async", "async-https", "tokio"]
Expand Down
4 changes: 2 additions & 2 deletions ci/pin-msrv.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -euo pipefail

# Pin dependencies for MSRV (1.75.0)
cargo update -p minreq --precise "2.13.2"
cargo update -p native-tls --precise "0.2.11"
Copy link
Collaborator

Choose a reason for hiding this comment

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

why did you have to pin this down to 0.2.11, if the 0.2.13 already has 1.53.0 as MSRV ?

Copy link
Member Author

Choose a reason for hiding this comment

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

Some transitive dependency was breaking our MSRV.

cargo update -p idna_adapter --precise "1.2.0"
cargo update -p native-tls --precise "0.2.13"
cargo update -p zerofrom --precise "0.1.5"
cargo update -p litemap --precise "0.7.4"
cargo update -p zerofrom --precise "0.1.5"
11 changes: 6 additions & 5 deletions justfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,14 @@ fmt:

# Build and test using the MSRV toolchain (1.75.0)
msrv:
bash ci/pin-msrv.sh
cargo +1.75.0 build --all-features
cargo +1.75.0 test --all-features -- --test-threads=1
rm -rf Cargo.lock
bash ci/pin-msrv.sh
cargo +1.75.0 build --all-features
cargo +1.75.0 test --all-features -- --test-threads=16

# Run pre-push suite: format, check, and test
pre-push: fmt check test
pre-push: fmt check test msrv

# Run all tests on the workspace with all features
test:
cargo test --all-features -- --test-threads=1
cargo test --all-features -- --test-threads=16
Loading