From 6d0d10521cecbb628bfa8e6d1851b91ec86977b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20S=C4=99k?= Date: Wed, 18 Dec 2019 15:15:11 +0100 Subject: [PATCH] Fix bump-version Makefile goal --- Makefile | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 11fcb8bd..aebe957a 100644 --- a/Makefile +++ b/Makefile @@ -152,14 +152,6 @@ test: ## Runs the go tests @echo "+ $@" @RUNNING_TESTS=1 go test -tags "$(BUILDTAGS) cgo" $(PACKAGES_FOR_UNIT_TESTS) -.PHONY: prepare-all-in-one-deploy-file -prepare-all-in-one-deploy-file: ## Prepares all in one deploy file - @echo "+ $@" - cp deploy/service_account.yaml deploy/$(ALL_IN_ONE_DEPLOY_FILE_PREFIX)-$(API_VERSION).yaml - cat deploy/role.yaml >> deploy/$(ALL_IN_ONE_DEPLOY_FILE_PREFIX)-$(API_VERSION).yaml - cat deploy/role_binding.yaml >> deploy/$(ALL_IN_ONE_DEPLOY_FILE_PREFIX)-$(API_VERSION).yaml - cat deploy/operator.yaml >> deploy/$(ALL_IN_ONE_DEPLOY_FILE_PREFIX)-$(API_VERSION).yaml - .PHONY: e2e CURRENT_DIRECTORY := $(shell pwd) e2e: docker-build ## Runs e2e tests, you can use EXTRA_ARGS @@ -386,6 +378,10 @@ bump-version: prepare-all-in-one-deploy-file ## Bump the version in the version sed -i s/$(VERSION)/$(NEW_VERSION)/g README.md sed -i s/$(VERSION)/$(NEW_VERSION)/g deploy/operator.yaml sed -i s/$(VERSION)/$(NEW_VERSION)/g deploy/$(ALL_IN_ONE_DEPLOY_FILE_PREFIX)-$(API_VERSION).yaml + cp deploy/service_account.yaml deploy/$(ALL_IN_ONE_DEPLOY_FILE_PREFIX)-$(API_VERSION).yaml + cat deploy/role.yaml >> deploy/$(ALL_IN_ONE_DEPLOY_FILE_PREFIX)-$(API_VERSION).yaml + cat deploy/role_binding.yaml >> deploy/$(ALL_IN_ONE_DEPLOY_FILE_PREFIX)-$(API_VERSION).yaml + cat deploy/operator.yaml >> deploy/$(ALL_IN_ONE_DEPLOY_FILE_PREFIX)-$(API_VERSION).yaml git add VERSION.txt README.md deploy/operator.yaml deploy/$(ALL_IN_ONE_DEPLOY_FILE_PREFIX)-$(API_VERSION).yaml git commit -vaem "Bump version to $(NEW_VERSION)" @echo "Run make tag to create and push the tag for new version $(NEW_VERSION)"