X-Git-Url: https://git.r.bdr.sh/rbdr/page/blobdiff_plain/260e8ec69b8e08b9fd105bf688e7a3a9fafecd61..3f1aa0b6eb90bd7912a63c6b72c2571486fbc21f:/Makefile?ds=sidebyside diff --git a/Makefile b/Makefile index 85cf266..33f107f 100644 --- a/Makefile +++ b/Makefile @@ -20,6 +20,12 @@ test: coverage: cargo tarpaulin +format: + cargo fmt && cargo clippy --fix + +lint: + cargo fmt -- --check && cargo clippy + release: rpm tar deb @$(eval filename := $(app_name)-$(target)-$(channel)) @@ -67,11 +73,11 @@ else $(MAKE) -e profile=release -e architectures='$(mac_architectures)' -e channel=$(tag) package endif -ci: +ci: lint coverage ifeq ($(GIT_REF),refs/heads/main) $(MAKE) -e profile=release -e channel=unstable package else ifneq (,$(findstring refs/tags/,$(GIT_REF))) $(MAKE) -e profile=release -e channel=$(subst refs/tags/,,$(GIT_REF)) package endif -.PHONY: default build $(architectures) rpm package prepare set_rust ci release test coverage +.PHONY: default build $(architectures) rpm package prepare set_rust ci release test coverage format