From d488b2d626761f6950f990ebca97672e052d8488 Mon Sep 17 00:00:00 2001 From: Travis Groth Date: Tue, 11 May 2021 18:37:04 -0400 Subject: [PATCH] deployment: fix empty version on master builds (#2193) --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 74e3cc3e3..a002d74f3 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,8 @@ CTIMEVAR=-X $(PKG)/internal/version.GitCommit=$(GITCOMMIT) \ -X $(PKG)/internal/version.Version=$(VERSION) \ -X $(PKG)/internal/version.BuildMeta=$(BUILDMETA) \ -X $(PKG)/internal/version.ProjectName=$(NAME) \ - -X $(PKG)/internal/version.ProjectURL=$(PKG) + -X $(PKG)/internal/version.ProjectURL=$(PKG) \ + -X $(PKG)/internal/envoy.Checksum=$$(cat ./bin/envoy.sha256 | tr -d '\n') GO ?= "go" GO_LDFLAGS=-ldflags "-s -w $(CTIMEVAR)" @@ -86,7 +87,7 @@ frontend: ## Runs go generate on the static assets package. build: ## Builds dynamic executables and/or packages. @echo "==> $@" ./scripts/get-envoy.bash - @CGO_ENABLED=0 GO111MODULE=on $(GO) build -tags "$(BUILDTAGS)" ${GO_LDFLAGS} -ldflags="-X github.com/pomerium/pomerium/internal/envoy.Checksum=$$(cat ./bin/envoy.sha256 | tr -d '\n')" -o $(BINDIR)/$(NAME) ./cmd/"$(NAME)" + @CGO_ENABLED=0 GO111MODULE=on $(GO) build -tags "$(BUILDTAGS)" ${GO_LDFLAGS} -o $(BINDIR)/$(NAME) ./cmd/"$(NAME)" ./scripts/embed-envoy.bash $(BINDIR)/$(NAME) .PHONY: build-debug