From ea749dcce67bfcafe7f92879062e0be4c825c03b Mon Sep 17 00:00:00 2001 From: Stefan Allius <122395479+s-allius@users.noreply.github.com> Date: Sun, 6 Apr 2025 22:28:32 +0200 Subject: [PATCH] enforce numbered release candidates (#353) --- app/Makefile | 11 ++++++++++- ha_addons/Makefile | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/app/Makefile b/app/Makefile index fb96df2..dff4631 100644 --- a/app/Makefile +++ b/app/Makefile @@ -22,7 +22,16 @@ dev debug: export IMAGE=$(PRIVAT_CONTAINER_REGISTRY)$(IMAGE) && \ docker buildx bake -f docker-bake.hcl $@ -preview rc rel: +rc: + @[ "${RC}" ] || ( echo ">> RC is not set"; exit 1 ) + @echo version: $(VERSION) build-date: $(BUILD_DATE) image: $(PUBLIC_CONTAINER_REGISTRY)$(IMAGE) + @echo login at $(PUBLIC_URL) as $(PUBLIC_USER) + @DO_LOGIN="$(shell echo $(PUBLIC_CR_KEY) | docker login $(PUBLIC_URL) -u $(PUBLIC_USER) --password-stdin)" + export VERSION=$(VERSION)-$@$(RC) && \ + export IMAGE=$(PUBLIC_CONTAINER_REGISTRY)$(IMAGE) && \ + docker buildx bake -f docker-bake.hcl $@ + +preview rel: @echo version: $(VERSION) build-date: $(BUILD_DATE) image: $(PUBLIC_CONTAINER_REGISTRY)$(IMAGE) @echo login at $(PUBLIC_URL) as $(PUBLIC_USER) @DO_LOGIN="$(shell echo $(PUBLIC_CR_KEY) | docker login $(PUBLIC_URL) -u $(PUBLIC_USER) --password-stdin)" diff --git a/ha_addons/Makefile b/ha_addons/Makefile index ea9bc55..ab162c4 100644 --- a/ha_addons/Makefile +++ b/ha_addons/Makefile @@ -47,7 +47,16 @@ dev debug: local_add_on export IMAGE=$(PRIVAT_CONTAINER_REGISTRY)$(IMAGE) && \ docker buildx bake -f docker-bake.hcl $@ -rc rel: local_add_on +rc: local_add_on + @[ "${RC}" ] || ( echo ">> RC is not set"; exit 1 ) + @echo version: $(VERSION) build-date: $(BUILD_DATE) image: $(PUBLIC_CONTAINER_REGISTRY)$(IMAGE) + @echo login at $(PUBLIC_URL) as $(PUBLIC_USER) + @DO_LOGIN="$(shell echo $(PUBLIC_CR_KEY) | docker login $(PUBLIC_URL) -u $(PUBLIC_USER) --password-stdin)" + export VERSION=$(VERSION)-$@$(RC) && \ + export IMAGE=$(PUBLIC_CONTAINER_REGISTRY)$(IMAGE) && \ + docker buildx bake -f docker-bake.hcl $@ + +rel: local_add_on @echo version: $(VERSION) build-date: $(BUILD_DATE) image: $(PUBLIC_CONTAINER_REGISTRY)$(IMAGE) @echo login at $(PUBLIC_URL) as $(PUBLIC_USER) @DO_LOGIN="$(shell echo $(PUBLIC_CR_KEY) | docker login $(PUBLIC_URL) -u $(PUBLIC_USER) --password-stdin)"