Skip to content

Commit

Permalink
better variable
Browse files Browse the repository at this point in the history
Update consul image on prepare-dev and prepare-release

remove consul-version script

remove consul-version script

Revert "remove consul-version script"

This reverts commit c7f00f5.

set script/make target to give image version
  • Loading branch information
curtbushko committed May 26, 2023
1 parent 37dd929 commit 35593ca
Show file tree
Hide file tree
Showing 3 changed files with 833 additions and 878 deletions.
18 changes: 13 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
VERSION = $(shell ./control-plane/build-support/scripts/version.sh control-plane/version/version.go)
CONSUL_VERSION = $(shell ./control-plane/build-support/scripts/consul-version.sh charts/consul/values.yaml)
CONSUL_IMAGE_VERSION = $(shell ./control-plane/build-support/scripts/consul-version.sh charts/consul/values.yaml)

# ===========> Helm Targets

Expand Down Expand Up @@ -149,8 +149,7 @@ version:
@echo $(VERSION)

consul-version:
@echo $(CONSUL_VERSION)

@echo $(CONSUL_IMAGE_VERSION)

# ===========> Release Targets

Expand All @@ -161,7 +160,13 @@ endif
ifndef RELEASE_DATE
$(error RELEASE_DATE is required, use format <Month> <Day>, <Year> (ex. October 4, 2022))
endif
source $(CURDIR)/control-plane/build-support/scripts/functions.sh; prepare_release $(CURDIR) $(RELEASE_VERSION) "$(RELEASE_DATE)" $(LAST_RELEASE_GIT_TAG) $(PRERELEASE_VERSION)
ifndef LAST_RELEASE_GIT_TAG
$(error LAST_RELEASE_GIT_TAG is required)
endif
ifndef CONSUL_VERSION
$(error CONSUL_VERSION is required)
endif
source $(CURDIR)/control-plane/build-support/scripts/functions.sh; prepare_release $(CURDIR) $(RELEASE_VERSION) "$(RELEASE_DATE)" $(LAST_RELEASE_GIT_TAG) $(CONSUL_VERSION) $(PRERELEASE_VERSION)

prepare-dev:
ifndef RELEASE_VERSION
Expand All @@ -173,7 +178,10 @@ endif
ifndef NEXT_RELEASE_VERSION
$(error NEXT_RELEASE_VERSION is required)
endif
source $(CURDIR)/control-plane/build-support/scripts/functions.sh; prepare_dev $(CURDIR) $(RELEASE_VERSION) "$(RELEASE_DATE)" $(NEXT_RELEASE_VERSION)
ifndef NEXT_CONSUL_VERSION
$(error NEXT_CONSUL_VERSION is required)
endif
source $(CURDIR)/control-plane/build-support/scripts/functions.sh; prepare_dev $(CURDIR) $(RELEASE_VERSION) "$(RELEASE_DATE)" "" $(NEXT_RELEASE_VERSION) $(NEXT_CONSUL_VERSION)

# ===========> Makefile config

Expand Down
Loading

0 comments on commit 35593ca

Please sign in to comment.