Skip to content

Commit

Permalink
CI, Makefile: clippy and check with all-features
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Lorak-mmk committed May 1, 2024
1 parent 9c9a31f commit e0783a5
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,14 @@ jobs:
run: cargo fmt --verbose --all -- --check
- name: Clippy check
run: cargo clippy --verbose --all-targets
- name: Clippy check with all features
run: cargo clippy --verbose --all-targets --all-features
- name: Cargo check without features
run: cargo check --all-targets --manifest-path "scylla/Cargo.toml" --features ""
- name: Cargo check with all serialization features
run: cargo check --all-targets --manifest-path "scylla/Cargo.toml" --features "full-serialization"
- name: Cargo check with all features
run: cargo check --all-targets --manifest-path "scylla/Cargo.toml" --all-features
- name: Cargo check with secret feature
run: cargo check --all-targets --manifest-path "scylla/Cargo.toml" --features "secret"
- name: Cargo check with chrono feature
Expand Down
12 changes: 10 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ COMPOSE := docker compose -f test/cluster/docker-compose.yml
all: test

.PHONY: ci
ci: fmt-check check check-without-features clippy test build
ci: fmt-check check check-without-features check-all-features clippy clippy-all-features test build

.PHONY: dockerized-ci
dockerized-ci: fmt-check check check-without-features clippy dockerized-test build
dockerized-ci: fmt-check check check-without-features check-all-features clippy clippy-all-features dockerized-test build

.PHONY: fmt
fmt:
Expand All @@ -25,10 +25,18 @@ check:
check-without-features:
cargo check --manifest-path "scylla/Cargo.toml" --features "" --all-targets

.PHONY: check-all-features
check-all-features:
cargo check --all-targets --all-features

.PHONY: clippy
clippy:
RUSTFLAGS=-Dwarnings cargo clippy --all-targets

.PHONY: clippy-all-features
clippy-all-features:
RUSTFLAGS=-Dwarnings cargo clippy --all-targets --all-features

.PHONY: test
test: up
SCYLLA_URI=172.42.0.2:9042 \
Expand Down

0 comments on commit e0783a5

Please sign in to comment.