Skip to content

Commit d2e6b28

Browse files
Fix vars in Makefile (#159)
Co-authored-by: ChristophShyper <45788587+ChristophShyper@users.noreply.github.com>
1 parent b8a66b4 commit d2e6b28

1 file changed

Lines changed: 2 additions & 3 deletions

File tree

Makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
phony: help
33

44
# Release tag for the action - use environment variable or fall back to latest git tag
5-
VERSION := $(or $(VERSION),$(shell git describe --tags --abbrev=0 2>/dev/null || echo "v0.11.1"))
5+
VERSION := $(or $(VERSION),$(shell git describe --tags --abbrev=0 2>/dev/null))
66

77
# GitHub Actions bogus variables
88
GITHUB_REF ?= refs/heads/null
@@ -12,13 +12,12 @@ VERSION_PREFIX ?=
1212
# Other variables and constants
1313
CURRENT_BRANCH := $(shell echo $(GITHUB_REF) | sed 's/refs\/heads\///')
1414
GITHUB_SHORT_SHA := $(shell echo $(GITHUB_SHA) | cut -c1-7)
15-
RELEASE_BRANCH := master
1615
DOCKER_USERNAME := $(or $(DOCKER_USERNAME),christophshyper)
1716
DOCKER_ORG_NAME := $(or $(DOCKER_ORG_NAME),devopsinfra)
1817
DOCKER_IMAGE := action-commit-push
1918
DOCKER_NAME := $(DOCKER_ORG_NAME)/$(DOCKER_IMAGE)
2019
GITHUB_USERNAME := $(or $(GITHUB_USERNAME),ChristophShyper)
21-
GITHUB_ORG_NAME := devops-infra
20+
GITHUB_ORG_NAME := $(or $(GITHUB_ORG_NAME),devops-infra)
2221
GITHUB_NAME := ghcr.io/$(GITHUB_ORG_NAME)/$(DOCKER_IMAGE)
2322
BUILD_DATE := $(shell date -u +"%Y-%m-%dT%H:%M:%SZ")
2423

0 commit comments

Comments
 (0)