From 59bbd5106599fe352315c38c05374491146021fd Mon Sep 17 00:00:00 2001 From: Nuno Diegues Date: Tue, 16 Nov 2021 10:37:59 +0000 Subject: [PATCH] TUN-5129: Remove `-dev` suffix when computing version and Git has uncommitted changes When building the docker image, this `-dev` suffix is being added to the cloudflared binary version. The reason must be that there's some file, which is tracked by git, and that is modified during that build. It's not clear which file is it. But, at the same time, it's not clear what advantage this `-dev` suffix is bringing. So we're simply removing it so that we generate proper versions (so that our tracking/observability can correctly aggregate these values). --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b04fa6b9..798a442b 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION := $(shell git describe --tags --always --dirty="-dev" --match "[0-9][0-9][0-9][0-9].*.*") +VERSION := $(shell git describe --tags --always --match "[0-9][0-9][0-9][0-9].*.*") MSI_VERSION := $(shell git tag -l --sort=v:refname | grep "w" | tail -1 | cut -c2-) #MSI_VERSION expects the format of the tag to be: (wX.X.X). Starts with the w character to not break cfsetup. #e.g. w3.0.1 or w4.2.10. It trims off the w character when creating the MSI.