Merge branch 'makefile' into Alpha

This commit is contained in:
gVisor bot 2022-05-02 14:43:51 +08:00
commit 535528c8bd

View file

@ -5,7 +5,7 @@ ifeq ($(BRANCH),Alpha)
VERSION=alpha-$(shell git rev-parse --short HEAD) VERSION=alpha-$(shell git rev-parse --short HEAD)
else ifeq ($(BRANCH),Beta) else ifeq ($(BRANCH),Beta)
VERSION=beta-$(shell git rev-parse --short HEAD) VERSION=beta-$(shell git rev-parse --short HEAD)
else ifeq ($(BRANCH),HEAD) else ifeq ($(BRANCH),)
VERSION=$(shell git describe --tags) VERSION=$(shell git describe --tags)
else else
VERSION=unknown VERSION=unknown