Fixed rspy check not being called
# Conflicts: # Makefile
This commit is contained in:
parent
36ea980725
commit
2008f2b7bc
10
Makefile
10
Makefile
@ -52,7 +52,7 @@ BUILDFLAGS := --release --strip
|
||||
DEVFLAGS := $(BUILDFLAGS)
|
||||
RUNFLAGS :=
|
||||
CHECKABLE_PY := pylib qt
|
||||
CHECKABLE_RS := rslib
|
||||
CHECKABLE_RS := rslib rspy
|
||||
DEVEL := rslib rspy pylib qt
|
||||
|
||||
.PHONY: all
|
||||
@ -155,14 +155,8 @@ clean-dist: buildhash
|
||||
check: pyenv buildhash prepare
|
||||
@set -eu -o pipefail ${SHELLFLAGS}; \
|
||||
.github/scripts/trailing-newlines.sh; \
|
||||
$(SUBMAKE) -C rslib develop; \
|
||||
for dir in $(CHECKABLE_RS); do \
|
||||
$(SUBMAKE) -C $$dir check; \
|
||||
done; \
|
||||
. "${ACTIVATE_SCRIPT}"; \
|
||||
$(SUBMAKE) -C rspy develop; \
|
||||
$(SUBMAKE) -C pylib develop; \
|
||||
for dir in $(CHECKABLE_PY); do \
|
||||
for dir in $(CHECKABLE_RS) $(CHECKABLE_PY); do \
|
||||
$(SUBMAKE) -C $$dir check; \
|
||||
done;
|
||||
@echo
|
||||
|
@ -17,7 +17,7 @@ $(shell mkdir -p .build)
|
||||
|
||||
all: check
|
||||
|
||||
check: ftl/repo .build/check
|
||||
check: .build/check
|
||||
|
||||
fix:
|
||||
cargo fmt
|
||||
@ -41,7 +41,7 @@ RUST_TOOLCHAIN := $(shell cat rust-toolchain)
|
||||
rustup component add clippy-preview --toolchain $(RUST_TOOLCHAIN)
|
||||
@touch $@
|
||||
|
||||
.build/check: .build/rs-tools $(ALL_SOURCE)
|
||||
.build/check: ftl/repo .build/rs-tools $(ALL_SOURCE)
|
||||
cargo test --lib -- --nocapture
|
||||
cargo fmt -- --check
|
||||
cargo clippy -- -D warnings
|
||||
|
@ -90,8 +90,12 @@ RUST_TOOLCHAIN := $(shell cat rust-toolchain)
|
||||
rustup component add clippy-preview --toolchain $(RUST_TOOLCHAIN)
|
||||
@touch $@
|
||||
|
||||
.build/check: build
|
||||
# cargo clippy also run build.rs, thus it must be called before calling .build/develop
|
||||
.build/check: .build/clippy .build/develop
|
||||
cargo fmt -- --check
|
||||
@touch $@
|
||||
|
||||
.build/clippy: $(DEPS)
|
||||
cargo clippy -- -D warnings
|
||||
@touch $@
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user