Address clippy

[rbdr/lyricli] / Makefile

diff --git a/Makefile b/Makefile
index e2c1648d4ef77a21e333ea81ca19d3f1d5a9f524..b763d51136b1e6e993d5365c4987d3d181a7fe91 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -15,6 +15,18 @@ prepare:
 build: prepare
        @export $$(cat .env | xargs) > /dev/null 2>&1 && cargo build --profile $(profile) --target $(target)
 
+test:
+       cargo 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))
 
@@ -55,15 +67,14 @@ tar: build
 package: $(architectures)
 
 mac:
-override architectures := x86_64-apple-darwin aarch64-apple-darwin
+       @$(eval mac_architectures := x86_64-apple-darwin aarch64-apple-darwin)
 ifeq ($(tag),)
-       $(MAKE) -e profile=release -e architectures='$(architectures)' -e channel=unstable package
+       $(MAKE) -e profile=release -e architectures='$(mac_architectures)' -e channel=unstable package
 else
-       $(MAKE) -e profile=release -e architectures='$(architectures)' -e channel=$(tag) package
+       $(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)))