From 48cda989047f1ecef125dbbcf4e43909f2cb331b Mon Sep 17 00:00:00 2001
From: ChristophShyper <45788587+ChristophShyper@users.noreply.github.com>
Date: Wed, 13 Aug 2025 09:39:13 +0200
Subject: [PATCH] Fix vars in Makefile

---
 Makefile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 3b54d79..c4fa55e 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 phony: help
 
 # Release tag for the action - use environment variable or fall back to latest git tag
-VERSION := $(or $(VERSION),$(shell git describe --tags --abbrev=0 2>/dev/null || echo "v0.11.1"))
+VERSION := $(or $(VERSION),$(shell git describe --tags --abbrev=0 2>/dev/null))
 
 # GitHub Actions bogus variables
 GITHUB_REF ?= refs/heads/null
@@ -12,13 +12,12 @@ VERSION_PREFIX ?=
 # Other variables and constants
 CURRENT_BRANCH := $(shell echo $(GITHUB_REF) | sed 's/refs\/heads\///')
 GITHUB_SHORT_SHA := $(shell echo $(GITHUB_SHA) | cut -c1-7)
-RELEASE_BRANCH := master
 DOCKER_USERNAME := $(or $(DOCKER_USERNAME),christophshyper)
 DOCKER_ORG_NAME := $(or $(DOCKER_ORG_NAME),devopsinfra)
 DOCKER_IMAGE := action-commit-push
 DOCKER_NAME := $(DOCKER_ORG_NAME)/$(DOCKER_IMAGE)
 GITHUB_USERNAME := $(or $(GITHUB_USERNAME),ChristophShyper)
-GITHUB_ORG_NAME := devops-infra
+GITHUB_ORG_NAME := $(or $(GITHUB_ORG_NAME),devops-infra)
 GITHUB_NAME := ghcr.io/$(GITHUB_ORG_NAME)/$(DOCKER_IMAGE)
 BUILD_DATE := $(shell date -u +"%Y-%m-%dT%H:%M:%SZ")