From 78dea1e17d9f2340212c13b66781dd402bc2746c Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Thu, 17 Oct 2024 04:10:53 +0200 Subject: [PATCH] build(Makefile): revise develop logic --- Makefile | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index f32894dbe..c9f92d2b1 100644 --- a/Makefile +++ b/Makefile @@ -329,21 +329,27 @@ image-rebuild-%: # DEV_PORT_HTTPS=`grep 'https:' develop/$(DATE)/backend/$(CONTAINER_ID) | sed 's/.*://'`; \ # ./utils/watchrun.sh develop/ ./start.sh - -#CURRENT_DEVELOP = $(shell mkdir -p develop && (ls -1 develop | tail -n1)) -CURRENT_DEVELOP = $(shell if [[ ! -e develop ]] ; then mkdir develop; $(MAKE) develop ; fi && (ls -1 develop | tail -n1)) -DEVELOP = develop/$(CURRENT_DEVELOP) DATE := $(shell date +'%Y-%m-%dT%H-%M-%S') -SET_DEVELOP = $(eval DEVELOP=develop/$$(DATE)) -.PHONY: develop -develop: - $(SET_DEVELOP) - mkdir -p develop/$(DATE) ---ensure-develop: +SET_DEVELOP = $(eval DEVELOP=develop/`ls -1 develop | tail -n1`) +NEW_DEVELOP = $(eval DEVELOP=develop/$$(DATE)) + +.PHONY: new-develop +# HELP: +new-develop: + $(NEW_DEVELOP) + mkdir -p $(DEVELOP) + $(MAKE) .current-develop +.PHONY: --develop +--develop: if ! [[ -e develop ]]; then \ - $(MAKE) develop; \ + $(MAKE) new-develop; \ fi + $(MAKE) .current-develop +.PHONY: .current-develop +.current-develop: + $(SET_DEVELOP) + echo "$(DEVELOP)" > .current-develop start: develop start-database start-memcached start-minio start-frontend start-backend;