From e0783a588558caa46ea0c05af742743682eda0d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karol=20Bary=C5=82a?= Date: Fri, 5 Apr 2024 13:17:40 +0200 Subject: [PATCH] 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. --- .github/workflows/rust.yml | 4 ++++ Makefile | 12 ++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index b398bdffdc..8fbfab11e8 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -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 diff --git a/Makefile b/Makefile index 5051d660af..9115122099 100644 --- a/Makefile +++ b/Makefile @@ -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: @@ -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 \