Skip to content

Commit b82cc23

Browse files
committed
CI, Makefile: clippy and check with all-features
In the previous version of tablet PR tablets were put behind "unstable-tablets" feature. In order to test them the feature had to be enabled, but CI / Makefile didn't do this for cargo check or clippy. While the tablets are no longer hidden behind feature flag, I think checking with all features is still a valid addition, so I decided to leave this commit as-is.
1 parent f763fcd commit b82cc23

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

.github/workflows/rust.yml

+4
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,14 @@ jobs:
3030
run: cargo fmt --verbose --all -- --check
3131
- name: Clippy check
3232
run: cargo clippy --verbose --all-targets
33+
- name: Clippy check with all features
34+
run: cargo clippy --verbose --all-targets --all-features
3335
- name: Cargo check without features
3436
run: cargo check --all-targets --manifest-path "scylla/Cargo.toml" --features ""
3537
- name: Cargo check with all serialization features
3638
run: cargo check --all-targets --manifest-path "scylla/Cargo.toml" --features "full-serialization"
39+
- name: Cargo check with all features
40+
run: cargo check --all-targets --manifest-path "scylla/Cargo.toml" --all-features
3741
- name: Cargo check with secret feature
3842
run: cargo check --all-targets --manifest-path "scylla/Cargo.toml" --features "secret"
3943
- name: Cargo check with chrono feature

Makefile

+10-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ COMPOSE := docker compose -f test/cluster/docker-compose.yml
44
all: test
55

66
.PHONY: ci
7-
ci: fmt-check check check-without-features clippy test build
7+
ci: fmt-check check check-without-features check-all-features clippy clippy-all-features test build
88

99
.PHONY: dockerized-ci
10-
dockerized-ci: fmt-check check check-without-features clippy dockerized-test build
10+
dockerized-ci: fmt-check check check-without-features check-all-features clippy clippy-all-features dockerized-test build
1111

1212
.PHONY: fmt
1313
fmt:
@@ -25,10 +25,18 @@ check:
2525
check-without-features:
2626
cargo check --manifest-path "scylla/Cargo.toml" --features "" --all-targets
2727

28+
.PHONY: check-all-features
29+
check-all-features:
30+
cargo check --all-targets --all-features
31+
2832
.PHONY: clippy
2933
clippy:
3034
RUSTFLAGS=-Dwarnings cargo clippy --all-targets
3135

36+
.PHONY: clippy-all-features
37+
clippy-all-features:
38+
RUSTFLAGS=-Dwarnings cargo clippy --all-targets --all-features
39+
3240
.PHONY: test
3341
test: up
3442
SCYLLA_URI=172.42.0.2:9042 \

0 commit comments

Comments
 (0)