Separate the tar

[rbdr/blog] / Makefile

diff --git a/Makefile b/Makefile
index 7fcb69280616a54109061a359601bf4b2731030a..f7b31308c233af27bda0c21b8917fe20dd68d26b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 profile := dev
 target = $(shell rustc -vV | grep host | awk '{print $$2}')
 architectures := x86_64-unknown-linux-gnu aarch64-unknown-linux-gnu
+app_name := blog
 
 default: build
 
@@ -13,29 +14,28 @@ prepare:
 build: prepare
        cargo build --profile $(profile) --target $(target)
 
-release:
-       @echo "Releasing target/$(target)/$(profile) to $(channel)"
+release: rpm tar
+       rsync $(app_name)-$(target)-$(channel).tar.gz deploy@build.r.bdr.sh:/srv/http/build.r.bdr.sh/$(app_name) target/$(target)/$(profile)/$(app_name)
 
 $(architectures):
-       $(MAKE) -e target=$@ rpm
 ifneq ($(channel),)
        $(MAKE) -e channel=$(channel) -e target=$@ release
+else
+       $(MAKE) -e target=$@ build
 endif
 
 rpm: build
 
+tar: build
+       tar -czvf $(app_name)-$(target)-$(channel).tar.gz -C target/$(target)/$(profile)/ $(app_name)
+
 package: $(architectures)
 
 ci:
 ifeq ($(GIT_REF),refs/heads/main)
-       @$(eval channel=unstable)
+       $(MAKE) -e profile=release -e channel=unstable package
 else ifneq (,$(findstring refs/tags/,$(GIT_REF)))
-       @$(eval channel=$(subst refs/tags/,,$(GIT_REF)))
-endif
-ifneq ($(channel),)
-       $(MAKE) -e profile=release -e channel=$(channel) package
-else
-       @echo "Channel was $(channel)"
+       $(MAKE) -e profile=release -e channel=$(subst refs/tags/,,$(GIT_REF)) package
 endif
 
 .PHONY: default build $(architectures) rpm package prepare set_rust ci release