Merge pull request #76 from Mirantis/fix/buildscripts

Fix the Makefiles so `--buildinfo` and the version are set correctly
Mirantis · Jun 15, 2022 · b872f96 · b872f96
2 parents 0737013 + 13c8570
commit b872f96
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -12,7 +12,7 @@ endif
 export VERSION?=$(shell (git describe --abbrev=0 --tags | sed -e 's/v//') || echo $(cat VERSION)-$(git log -1 --pretty='%h'))
 PRERELEASE=`grep -q dev <<< "${VERSION}" && echo "pre" || echo ""`
 REVISION?=`git log -1 --pretty='%h'`
-export CRI_DOCKERD_LDFLAGS=-ldflags "-X github.com/Mirantis/cri-dockerd/version.Version=${VERSION} -X github.com/Mirantis/cri-dockerd/version.PreRelease=${PRERELEASE} -X github.com/Mirantis/cri-dockerd/version.BuildTime=${BUILD_DATE} -X github.com/Mirantis/cri-dockerd/version.GitCommit=${REVISION}"
+export CRI_DOCKERD_LDFLAGS=-ldflags "-X github.com/Mirantis/cri-dockerd/cmd/version.Version=${VERSION} -X github.com/Mirantis/cri-dockerd/cmd/version.PreRelease=${PRERELEASE} -X github.com/Mirantis/cri-dockerd/cmd/version.BuildTime=${BUILD_DATE} -X github.com/Mirantis/cri-dockerd/cmd/version.GitCommit=${REVISION}"
 
 .PHONY: help
 help: ## show make targets

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.2.2-dev
+0.2.3-dev
diff --git a/cmd/version/version.go b/cmd/version/version.go
@@ -2,7 +2,7 @@ package version
 
 var (
  // Version of the product
- Version = "0.2.1"
+ Version = "0.2.3"
  // PreRelease is set during the build
  PreRelease = ""
  // GitCommit is set during the build