From f7a3e51208bd97616cc6335058bc21766145f112 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Pi=C4=85tkowski?= Date: Tue, 3 Dec 2024 15:45:28 +0100 Subject: [PATCH] fix: version setting in makefile --- Makefile.abs.mk | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile.abs.mk b/Makefile.abs.mk index 015f8cad..527d5a41 100644 --- a/Makefile.abs.mk +++ b/Makefile.abs.mk @@ -19,12 +19,12 @@ __check_defined = \ all: docker-build -release: release_ver_to_code docker-build-no-version docker-test - echo "build_ver = \"${TAG}\"" > app_build_suite/version.py +release: docker-test release_ver_to_code git add --force app_build_suite/version.py - git add dabs.sh + git add dabs.sh setup.py git commit -m "Release ${TAG}" --no-verify git tag ${TAG} + docker build . -t ${IMG}:latest -t ${IMG}:${TAG} mv dabs.sh.back dabs.sh echo "build_ver = \"${TAG}-dev\"" > app_build_suite/version.py git add dabs.sh @@ -33,10 +33,11 @@ release: release_ver_to_code docker-build-no-version docker-test release_ver_to_code: $(call check_defined, TAG) + sed -i 's/version\=".*"/version\="'${TAG}'"/' setup.py echo "build_ver = \"${TAG}\"" > app_build_suite/version.py $(eval IMG_VER := ${TAG}) cp dabs.sh dabs.sh.back - TAG=${TAG} bash -c 'sed -i "s/:-\".*\"/:-\"$${TAG#v}\"/" dabs.sh' + sed -i "s/:-\".*\"/:-\"$${TAG#v}\"/" dabs.sh # Build the docker image from locally built binary docker-build-no-version: