From 81374d08579038f7f6764593e954ad4e3be11856 Mon Sep 17 00:00:00 2001 From: Mateusz Korus Date: Thu, 29 Apr 2021 15:00:22 +0200 Subject: [PATCH] Bump backup PVC version to v0.1.1 --- .gitignore | 2 +- Makefile | 1 + backup/pvc/Makefile | 3 ++- backup/pvc/VERSION.txt | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ff5b041f..4fe56ae6 100644 --- a/.gitignore +++ b/.gitignore @@ -89,5 +89,5 @@ tags ### IntelliJ IDEA ### *.iml -bin +/bin testbin/* \ No newline at end of file diff --git a/Makefile b/Makefile index 295ef6aa..ccbc5e93 100644 --- a/Makefile +++ b/Makefile @@ -345,6 +345,7 @@ HAS_SEMBUMP := $(shell which $(PROJECT_DIR)/bin/sembump) sembump: # Download sembump locally if necessary @echo "+ $@" ifndef HAS_SEMBUMP + mkdir bin wget -O $(PROJECT_DIR)/bin/sembump https://github.com/justintout/sembump/releases/download/v0.1.0/sembump-$(PLATFORM)-amd64 chmod +x $(PROJECT_DIR)/bin/sembump endif diff --git a/backup/pvc/Makefile b/backup/pvc/Makefile index 7a187f28..a45493d8 100644 --- a/backup/pvc/Makefile +++ b/backup/pvc/Makefile @@ -11,6 +11,7 @@ include $(config) PREFIX?=$(shell pwd) VERSION := $(shell cat VERSION.txt) +PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST)))) GITCOMMIT := $(shell git rev-parse --short HEAD) GITBRANCH := $(shell git rev-parse --abbrev-ref HEAD) GITUNTRACKEDCHANGES := $(shell git status --porcelain --untracked-files=no) @@ -130,7 +131,7 @@ docker-run: docker-build ## Run the container in docker, you can use EXTRA_ARGS BUMP := patch bump-version: ## Bump the version in the version file. Set BUMP to [ patch | major | minor ] @echo "+ $@" - $(eval NEW_VERSION=$(shell sembump --kind $(BUMP) $(VERSION))) + $(eval NEW_VERSION=$(shell $(PROJECT_DIR)/../../bin/sembump --kind $(BUMP) $(VERSION))) @echo "Bumping VERSION.txt from $(VERSION) to $(NEW_VERSION)" echo $(NEW_VERSION) > VERSION.txt git add VERSION.txt diff --git a/backup/pvc/VERSION.txt b/backup/pvc/VERSION.txt index b82608c0..8308b63a 100644 --- a/backup/pvc/VERSION.txt +++ b/backup/pvc/VERSION.txt @@ -1 +1 @@ -v0.1.0 +v0.1.1