Run the make in the app

[rbdr/blog] / Makefile

diff --git a/Makefile b/Makefile
index b8c68207974a352a4739244c5af6d56e6d8a186d..0a4d393e8b44e261ef8b617dff425de8c02a2680 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ build: prepare
        cargo build --profile $(profile) --target $(target)
 
 release:
        cargo build --profile $(profile) --target $(target)
 
 release:

-       @echo "Releasing $(target) to $(channel)"
+       @echo "Releasing target/$(target)/$(profile) to $(channel)"

 
 $(architectures):
        $(MAKE) -e target=$@ rpm
 
 $(architectures):
        $(MAKE) -e target=$@ rpm


@@ -28,12 +28,9 @@ package: $(architectures)
 
 ci:
 ifeq ($(GIT_REF),refs/heads/main)
 
 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)))
 else ifneq (,$(findstring refs/tags/,$(GIT_REF)))

-       @$(eval channel=$(subst refs/tags/,,$(GIT_REF)))
-endif
-ifneq ($(channel),)
-       $(MAKE) -e channel=$(channel) package
+       $(MAKE) -e profile=release -e channel=$(subst refs/tags/,,$(GIT_REF)) package

 endif
 
 .PHONY: default build $(architectures) rpm package prepare set_rust ci release
 endif
 
 .PHONY: default build $(architectures) rpm package prepare set_rust ci release