Remove fail threshold as it's not consistent

[rbdr/page] / Makefile

diff --git a/Makefile b/Makefile
index 04e6cd6ef69e907ea4ff861c2a4d056a25507f05..33f107f8dac21b848d4c662a00d36d607432c5e9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -14,8 +14,20 @@ prepare:
 build: prepare
        cargo build --profile $(profile) --target $(target)
 
-release: rpm tar
-       rsync -avz $(app_name)-$(target)-$(channel).tar.gz deploy@conchos.unlimited.pizza:/srv/http/build.r.bdr.sh/$(app_name)
+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))
 
 $(architectures):
 ifneq ($(channel),)
@@ -24,18 +36,48 @@ else
        $(MAKE) -e target=$@ build
 endif
 
+deb: build
+ifeq ($(findstring linux,$(target)),linux)
+       @$(eval filename := $(app_name)-$(target)-$(channel))
+       cargo deb --profile $(profile) --target $(target)
+       mv target/$(target)/debian/*.deb $(filename).deb
+       sha256sum $(filename).deb > $(filename).deb.sha256
+       rsync -avz $(filename).deb deploy@conchos.unlimited.pizza:/srv/http/build.r.bdr.sh/$(app_name)
+       rsync -avz $(filename).deb.sha256 deploy@conchos.unlimited.pizza:/srv/http/build.r.bdr.sh/$(app_name)
+endif
+
 rpm: build
+ifeq ($(findstring linux,$(target)),linux)
+       @$(eval filename := $(app_name)-$(target)-$(channel))
+       cargo generate-rpm --profile $(profile) --target $(target)
+       mv target/$(target)/generate-rpm/*.rpm $(filename).rpm
+       sha256sum $(filename).rpm > $(filename).rpm.sha256
+       rsync -avz $(filename).rpm deploy@conchos.unlimited.pizza:/srv/http/build.r.bdr.sh/$(app_name)
+       rsync -avz $(filename).rpm.sha256 deploy@conchos.unlimited.pizza:/srv/http/build.r.bdr.sh/$(app_name)
+endif
 
 tar: build
-       tar -czvf $(app_name)-$(target)-$(channel).tar.gz -C target/$(target)/$(profile)/ $(app_name)
+       @$(eval filename := $(app_name)-$(target)-$(channel))
+       tar -czvf $(filename).tar.gz -C target/$(target)/$(profile)/ $(app_name)
+       sha256sum $(filename).tar.gz > $(filename).tar.gz.sha256
+       rsync -avz $(filename).tar.gz deploy@conchos.unlimited.pizza:/srv/http/build.r.bdr.sh/$(app_name)
+       rsync -avz $(filename).tar.gz.sha256 deploy@conchos.unlimited.pizza:/srv/http/build.r.bdr.sh/$(app_name)
 
 package: $(architectures)
 
-ci:
+mac:
+       @$(eval mac_architectures := x86_64-apple-darwin aarch64-apple-darwin)
+ifeq ($(tag),)
+       $(MAKE) -e profile=release -e architectures='$(mac_architectures)' -e channel=unstable package
+else
+       $(MAKE) -e profile=release -e architectures='$(mac_architectures)' -e channel=$(tag) package
+endif
+
+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
+.PHONY: default build $(architectures) rpm package prepare set_rust ci release test coverage format