Address clippy

[rbdr/lyricli] / Makefile

diff --git a/Makefile b/Makefile
index 516f47e562eb8ffebe5828f5969dfd824c3320c0..b763d51136b1e6e993d5365c4987d3d181a7fe91 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,6 @@ target = $(shell rustc -vV | grep host | awk '{print $$2}')
 architectures := x86_64-unknown-linux-gnu aarch64-unknown-linux-gnu
 app_name := lrc
 long_app_name := lyricli
 architectures := x86_64-unknown-linux-gnu aarch64-unknown-linux-gnu
 app_name := lrc
 long_app_name := lyricli

-host_architecture := $(target)

 
 default: build
 
 
 default: build
 


@@ -14,15 +13,20 @@ prepare:
        rustup target add $(target)
 
 build: prepare
        rustup target add $(target)
 
 build: prepare

-# I need an actually configurable way to make this work. Right now i'm only
-# cross compiling in the CI, and I know what I'm running, but
-ifeq ($(host_architecture), x86_64-unknown-linux-gnu)
-ifeq ($(target), aarch64-unknown-linux-gnu)
-    LD_LIBRARY_PATH=/usr/local/aarch64-linux-gnu/lib:${LD_LIBRARY_PATH}
-endif
-endif

        @export $$(cat .env | xargs) > /dev/null 2>&1 && cargo build --profile $(profile) --target $(target)
 
        @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))
 
 release: rpm tar deb
        @$(eval filename := $(app_name)-$(target)-$(channel))
 


@@ -70,8 +74,7 @@ else
        $(MAKE) -e profile=release -e architectures='$(mac_architectures)' -e channel=$(tag) package
 endif
 
        $(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)))
 ifeq ($(GIT_REF),refs/heads/main)
        $(MAKE) -e profile=release -e channel=unstable package
 else ifneq (,$(findstring refs/tags/,$(GIT_REF)))