From 85ce2e0238160754bdc7b1bf0698b069b5f0b3d1 Mon Sep 17 00:00:00 2001 From: Zsolt Tasnadi Date: Thu, 29 Jan 2026 20:16:38 +0100 Subject: [PATCH] branch into version --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a4c503e..0af8361 100644 --- a/Makefile +++ b/Makefile @@ -82,8 +82,11 @@ clean: # CI/CD Targets ci-version: - @echo "==> Extracting version" @VERSION=$$(sed -n "s/^-- version: //p" inc/meta/meta.header.lua | head -n 1 | tr -d "[:space:]"); \ + BRANCH=$${CI_COMMIT_BRANCH:-$${WOODPECKER_BRANCH}}; \ + if [ "$$BRANCH" != "main" ] && [ "$$BRANCH" != "master" ] && [ -n "$$BRANCH" ]; then \ + VERSION=dev-$$VERSION-$$BRANCH; \ + fi; \ echo "VERSION is: $$VERSION"; \ echo $$VERSION > $(VERSION_FILE)