Skip to content

Commit 4d6aa3a

Browse files
committed
make: cluster version flags together for clarity
1 parent ee0b36a commit 4d6aa3a

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

make/release_flags.mk

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
1+
# One can either specify a git tag as the version suffix or one that is
2+
# generated from the current date.
13
VERSION_TAG = $(shell date +%Y%m%d)-01
24
VERSION_CHECK = @$(call print, "Building master with date version tag")
35

6+
ifneq ($(tag),)
7+
VERSION_TAG = $(tag)
8+
VERSION_CHECK = ./scripts/release.sh check-tag "$(VERSION_TAG)" "$(VERSION_GO_FILE)"
9+
endif
10+
411
DOCKER_RELEASE_HELPER = docker run \
512
-it \
613
--rm \
@@ -22,13 +29,6 @@ windows-amd64
2229

2330
RELEASE_TAGS = monitoring
2431

25-
# One can either specify a git tag as the version suffix or one is generated
26-
# from the current date.
27-
ifneq ($(tag),)
28-
VERSION_TAG = $(tag)
29-
VERSION_CHECK = ./scripts/release.sh check-tag "$(VERSION_TAG)" "$(VERSION_GO_FILE)"
30-
endif
31-
3232
# By default we will build all systems. But with the 'sys' tag, a specific
3333
# system can be specified. This is useful to release for a subset of
3434
# systems/architectures.

0 commit comments

Comments
 (0)