Skip to content

Commit d267de8

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 d267de8

File tree

1 file changed

+15
-6
lines changed

1 file changed

+15
-6
lines changed

justfile

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,23 @@ default:
1212

1313
# Cargo build everything.
1414
build:
15-
<<<<<<< HEAD
1615
cargo build --workspace --all-targets --all-features
16+
cargo build -p corepc-client --all-targets --all-features
17+
cargo build -p corepc-types --all-targets --all-features
18+
cargo build -p jsonrpc --all-targets --all-features
19+
cargo build -p corepc-node --all-targets --features=latest
20+
cargo build --manifest-path verify/Cargo.toml --all-targets
1721

1822
# Cargo check everything.
1923
check:
20-
cargo check --workspace --all-targets --all-features
24+
cargo check -p corepc-client --all-targets --all-features
25+
cargo check -p corepc-types --all-targets --all-features
26+
cargo check -p jsonrpc --all-targets --all-features
27+
cargo check -p corepc-node --all-targets --features=latest
28+
cargo check --manifest-path verify/Cargo.toml --all-targets
2129

2230
# Lint everything.
2331
lint: lint-verify lint-integration-tests
24-
cargo +$(cat ./nightly-version) clippy --workspace --all-targets --all-features -- --deny warnings
25-
=======
2632
cargo build -p corepc-client --all-targets --all-features
2733
cargo build -p corepc-types --all-targets --all-features
2834
cargo build -p jsonrpc --all-targets --all-features
@@ -44,7 +50,6 @@ lint: lint-verify lint-integration-tests
4450
cargo +$(cat ./nightly-version) clippy -p jsonrpc --all-targets --all-features -- --deny warnings
4551
cargo +$(cat ./nightly-version) clippy -p corepc-node --all-targets --features=latest -- --deny warnings
4652
cargo +$(cat ./nightly-version) clippy --manifest-path verify/Cargo.toml --all-targets -- --deny warnings
47-
>>>>>>> 2d0ee43 (Add latest feature to avoid hardcoded versions in build scripts)
4853

4954
lint-verify:
5055
$REPO_DIR/contrib/lint-verify.sh
@@ -64,7 +69,11 @@ format:
6469

6570
# Generate documentation.
6671
docsrs *flags:
67-
RUSTDOCFLAGS="--cfg docsrs -D warnings -D rustdoc::broken-intra-doc-links" cargo +$(cat ./nightly-version) doc --all-features {{flags}}
72+
RUSTDOCFLAGS="--cfg docsrs -D warnings -D rustdoc::broken-intra-doc-links" cargo +$(cat ./nightly-version) doc -p corepc-client --all-features {{flags}}
73+
RUSTDOCFLAGS="--cfg docsrs -D warnings -D rustdoc::broken-intra-doc-links" cargo +$(cat ./nightly-version) doc -p corepc-types --all-features {{flags}}
74+
RUSTDOCFLAGS="--cfg docsrs -D warnings -D rustdoc::broken-intra-doc-links" cargo +$(cat ./nightly-version) doc -p jsonrpc --all-features {{flags}}
75+
RUSTDOCFLAGS="--cfg docsrs -D warnings -D rustdoc::broken-intra-doc-links" cargo +$(cat ./nightly-version) doc -p corepc-node --features=29_0 {{flags}}
76+
(cd verify && RUSTDOCFLAGS="--cfg docsrs -D warnings -D rustdoc::broken-intra-doc-links" cargo +$(cat ../nightly-version) doc {{flags}})
6877

6978
# Update the recent and minimal lock files.
7079
update-lock-files:

0 commit comments

Comments
 (0)