Skip to content

Commit 4f1f741

Browse files
committed
Fix build to avoid conflicting version features
The previous build configuration used `--all-features` at the workspace level, which caused conflicts with mutually exclusive version features in the node and integration_test crates (e.g., v29_0, v28_2, etc.).
1 parent ca2a959 commit 4f1f741

File tree

1 file changed

+26
-2
lines changed

1 file changed

+26
-2
lines changed

justfile

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,28 @@ default:
1212

1313
# Cargo build everything.
1414
build:
15+
<<<<<<< HEAD
1516
<<<<<<< HEAD
1617
cargo build --workspace --all-targets --all-features
18+
=======
19+
cargo build -p corepc-client --all-targets --all-features
20+
cargo build -p corepc-types --all-targets --all-features
21+
cargo build -p jsonrpc --all-targets --all-features
22+
cargo build -p corepc-node --all-targets --features=29_0
23+
cargo build --manifest-path verify/Cargo.toml --all-targets
24+
>>>>>>> 43cfa7f (Fix build to avoid conflicting version features)
1725

1826
# Cargo check everything.
1927
check:
20-
cargo check --workspace --all-targets --all-features
28+
cargo check -p corepc-client --all-targets --all-features
29+
cargo check -p corepc-types --all-targets --all-features
30+
cargo check -p jsonrpc --all-targets --all-features
31+
cargo check -p corepc-node --all-targets --features=29_0
32+
cargo check --manifest-path verify/Cargo.toml --all-targets
2133

2234
# Lint everything.
2335
lint: lint-verify lint-integration-tests
36+
<<<<<<< HEAD
2437
cargo +$(cat ./nightly-version) clippy --workspace --all-targets --all-features -- --deny warnings
2538
=======
2639
cargo build -p corepc-client --all-targets --all-features
@@ -45,6 +58,13 @@ lint: lint-verify lint-integration-tests
4558
cargo +$(cat ./nightly-version) clippy -p corepc-node --all-targets --features=latest -- --deny warnings
4659
cargo +$(cat ./nightly-version) clippy --manifest-path verify/Cargo.toml --all-targets -- --deny warnings
4760
>>>>>>> 2d0ee43 (Add latest feature to avoid hardcoded versions in build scripts)
61+
=======
62+
cargo +$(cat ./nightly-version) clippy -p corepc-client --all-targets --all-features -- --deny warnings
63+
cargo +$(cat ./nightly-version) clippy -p corepc-types --all-targets --all-features -- --deny warnings
64+
cargo +$(cat ./nightly-version) clippy -p jsonrpc --all-targets --all-features -- --deny warnings
65+
cargo +$(cat ./nightly-version) clippy -p corepc-node --all-targets --features=29_0 -- --deny warnings
66+
cargo +$(cat ./nightly-version) clippy --manifest-path verify/Cargo.toml --all-targets -- --deny warnings
67+
>>>>>>> 43cfa7f (Fix build to avoid conflicting version features)
4868

4969
lint-verify:
5070
$REPO_DIR/contrib/lint-verify.sh
@@ -64,7 +84,11 @@ format:
6484

6585
# Generate documentation.
6686
docsrs *flags:
67-
RUSTDOCFLAGS="--cfg docsrs -D warnings -D rustdoc::broken-intra-doc-links" cargo +$(cat ./nightly-version) doc --all-features {{flags}}
87+
RUSTDOCFLAGS="--cfg docsrs -D warnings -D rustdoc::broken-intra-doc-links" cargo +$(cat ./nightly-version) doc -p corepc-client --all-features {{flags}}
88+
RUSTDOCFLAGS="--cfg docsrs -D warnings -D rustdoc::broken-intra-doc-links" cargo +$(cat ./nightly-version) doc -p corepc-types --all-features {{flags}}
89+
RUSTDOCFLAGS="--cfg docsrs -D warnings -D rustdoc::broken-intra-doc-links" cargo +$(cat ./nightly-version) doc -p jsonrpc --all-features {{flags}}
90+
RUSTDOCFLAGS="--cfg docsrs -D warnings -D rustdoc::broken-intra-doc-links" cargo +$(cat ./nightly-version) doc -p corepc-node --features=29_0 {{flags}}
91+
(cd verify && RUSTDOCFLAGS="--cfg docsrs -D warnings -D rustdoc::broken-intra-doc-links" cargo +$(cat ../nightly-version) doc {{flags}})
6892

6993
# Update the recent and minimal lock files.
7094
update-lock-files:

0 commit comments

Comments
 (0)