From 58a2f63bbe5370ab5bd2e8eca4893ab62b2d6ff1 Mon Sep 17 00:00:00 2001
From: Jonas Forsberg <jonas.forsberg@suse.com>
Date: Mon, 17 Apr 2023 13:33:20 +0200
Subject: [PATCH] cleaned up git clean checks

---
 Makefile | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 1aa59a4..cb63bf5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,25 @@
-.PHONY: default build clean
+.PHONY: default build clean release require_clean_git
+
 
 -include .env
 
 VERSION=0.15.1-1.2
+IMAGENAME=restic
+REPO=docker.io/bardak
 
 SHELL := /bin/bash
 
-guard:
-	@ if [ -z "$(git status --porcelain)" ]; then echo "git repo not clean"; exit 1; fi
+require_clean_git:
+	git update-index -q --ignore-submodules --refresh
+	git diff-files --quiet --ignore-submodules
+	git diff-index --cached --quiet --ignore-submodules HEAD --
+	@status=$$(git status --porcelain); \
+	if test "x$${status}" = x; then \
+		echo "No untracked files detected"; \
+	else \
+		echo "Untracked files detected" >&2; \
+		exit 1; \
+	fi
 
 default: build
 
@@ -17,5 +29,10 @@ build:
 clean:
 	podman image rm docker.io/bardak/restic:$(VERSION)
 
-push: guard build
-	podman push --creds $(USERNAME):$(PASSWORD) docker.io/bardak/restic:$(VERSION)
+release: require_clean_git build
+		$(eval TMP_MESSAGE := $(shell podman run --rm -it ${REPO}/${IMAGENAME}:$(VERSION) /usr/bin/restic --version))
+	git tag -a v$(VERSION) -m "${TMP_MESSAGE}"
+	git push origin v$(VERSION)
+	podman tag ${REPO}/${IMAGENAME}:$(VERSION) ${REPO}/${IMAGENAME}:latest
+	podman push --creds $(USERNAME):$(PASSWORD) ${REPO}/${IMAGENAME}:$(VERSION)
+	podman push --creds $(USERNAME):$(PASSWORD) ${REPO}/${IMAGENAME}:latest