@@ -19,23 +19,23 @@ SEMVER_MAJOR_VERSION ?=3
1919SEMVER_MINOR_VERSION ?=0
2020SEMVER_PATCH_VERSION ?=1
2121SEMVER_PRERELEASE ?= dev
22- SEMVER_BUILDMETA ?= + 0
22+ SEMVER_BUILDMETA ?= 0
2323BUILD_DATE :=$(shell date -u -Iseconds)
2424BUILD_VCS_URL :=$(shell git config --get remote.origin.url)
2525BUILD_VCS_ID :=$(shell git log -n 1 --date=iso-strict-local --format="% h")
2626BUILD_VCS_ID_DATE :=$(shell TZ=UTC0 git log -n 1 --date=iso-strict-local --format='% ad')
27- FILE_BUILD_VERSION :=$(SEMVER_VERSION )$ (SEMVER_PRERELEASE )$(SEMVER_BUILDMETA )
27+ FILE_BUILD_VERSION :=$(SEMVER_MAJOR_VERSION ) .${SEMVER_MINOR_VERSION}.${SEMVER_PATCH_VERSION}- $ (SEMVER_PRERELEASE )+ $(SEMVER_BUILDMETA )
2828
2929GO_LDFLAGS = -ldflags="$(BUILDFLAGS ) \
30- -X '$(GOMODULECMD ) .BuildMajorVersion=$(SEMVER_MAJOR_VERSION ) ' \
31- -X '$(GOMODULECMD ) .BuildMinorVersion=$(SEMVER_MINOR_VERSION ) ' \
32- -X '$(GOMODULECMD ) .BuildPatchVersion=$(SEMVER_PATCH_VERSION ) ' \
33- -X '$(GOMODULECMD ) .BuildPrerelease=$(SEMVER_PRERELEASE ) ' \
34- -X '$(GOMODULECMD ) .BuildMeta=$(SEMVER_BUILDMETA ) ' \
35- -X '$(GOMODULECMD ) .BuildDate=$(BUILD_DATE ) ' \
36- -X '$(GOMODULECMD ) .BuildVcsUrl=$(BUILD_VCS_URL ) ' \
37- -X '$(GOMODULECMD ) .BuildVcsId=$(BUILD_VCS_ID ) ' \
38- -X '$(GOMODULECMD ) .BuildVcsIdDate=$(BUILD_VCS_ID_DATE ) '"
30+ -X '$(GOMODULECMD ) .BuildMajorVersion=$(SEMVER_MAJOR_VERSION ) ' \
31+ -X '$(GOMODULECMD ) .BuildMinorVersion=$(SEMVER_MINOR_VERSION ) ' \
32+ -X '$(GOMODULECMD ) .BuildPatchVersion=$(SEMVER_PATCH_VERSION ) ' \
33+ -X '$(GOMODULECMD ) .BuildPrerelease=$(SEMVER_PRERELEASE ) ' \
34+ -X '$(GOMODULECMD ) .BuildMeta=$(SEMVER_BUILDMETA ) ' \
35+ -X '$(GOMODULECMD ) .BuildDate=$(BUILD_DATE ) ' \
36+ -X '$(GOMODULECMD ) .BuildVcsUrl=$(BUILD_VCS_URL ) ' \
37+ -X '$(GOMODULECMD ) .BuildVcsId=$(BUILD_VCS_ID ) ' \
38+ -X '$(GOMODULECMD ) .BuildVcsIdDate=$(BUILD_VCS_ID_DATE ) '"
3939
4040test_dirs =$(shell find . -name "* _test.go" -exec dirname {} \; | cut -d/ -f2 | sort | uniq)
4141
@@ -74,4 +74,3 @@ build: clean
7474
7575test :
7676 @ginkgo .
77-
0 commit comments