From 7a1311698cf379786e604a43682691a1437add49 Mon Sep 17 00:00:00 2001 From: Lantao Liu Date: Mon, 29 Oct 2018 18:13:33 -0700 Subject: [PATCH] Use commit as version. Signed-off-by: Lantao Liu --- Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index f8713bc68..8202d7ca3 100644 --- a/Makefile +++ b/Makefile @@ -19,11 +19,9 @@ EPOCH_TEST_COMMIT := f9e02affccd51702191e5312665a16045ffef8ab PROJECT := github.com/containerd/cri BINDIR := ${DESTDIR}/usr/local/bin BUILD_DIR := _output -# VERSION is derived from the current tag for HEAD plus amends. Version is used +# VERSION is derived from the current commit for HEAD. Version is used # to set/overide the containerd version in vendor/github.com/containerd/containerd/version. -VERSION := $(shell git describe --tags --dirty --always) -# strip the first char of the tag if it's a `v` -VERSION := $(VERSION:v%=%) +VERSION := $(shell git rev-parse --short HEAD) TARBALL_PREFIX := cri-containerd TARBALL := $(TARBALL_PREFIX)-$(VERSION).$(GOOS)-$(GOARCH).tar.gz BUILD_TAGS := seccomp apparmor