From f6d55d93e66b3a38fbbf3a49d06f06b4efe95087 Mon Sep 17 00:00:00 2001 From: Martastain Date: Fri, 20 Dec 2024 10:17:53 +0100 Subject: [PATCH] chore: use +git version when starting service from makefile --- services/processor/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/services/processor/Makefile b/services/processor/Makefile index eefaf99..1031baf 100644 --- a/services/processor/Makefile +++ b/services/processor/Makefile @@ -1,6 +1,7 @@ include .env -AYON_ADDON_VERSION=$(shell python -c "import os;import sys;content={};f=open('$(CURDIR)/../../package.py');exec(f.read(),content);f.close();print(content['version'])") +AYON_ADDON_VERSION=$(shell python -c "import os;import sys;content={};f=open('$(CURDIR)/../../package.py');exec(f.read(),content);f.close();print(content['version'].replace('+', '-'))") +AYON_WORKING_VERSION=$(shell python -c "import os;import sys;content={};f=open('$(CURDIR)/../../package.py');exec(f.read(),content);f.close();print(content['version'].split('-')[0].split('+')[0] + '+git')") AYON_ADDON_NAME=kitsu SERVICE_NAME=processor BASE_NAME := ayon-$(AYON_ADDON_NAME)-$(SERVICE_NAME) @@ -46,5 +47,5 @@ dev: build --env AYON_API_KEY=${AYON_API_KEY} \ --env AYON_SERVER_URL=${AYON_SERVER_URL} \ --env AYON_ADDON_NAME=${AYON_ADDON_NAME} \ - --env AYON_ADDON_VERSION=$(AYON_ADDON_VERSION) \ + --env AYON_ADDON_VERSION=$(AYON_WORKING_VERSION) \ $(IMAGE) python -m processor