From eca39e12f21434dda1eedd391db1154dee148e71 Mon Sep 17 00:00:00 2001 From: Igor Mandrigin <mandrigin@users.noreply.github.com> Date: Fri, 11 Sep 2020 17:42:33 +0100 Subject: [PATCH] Fix reproducible builds (#1099) --- Makefile | 4 ++-- cmd/tg/main.go | 5 ++--- turbo/node/node.go | 5 ++--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index c5fbc100ed..3bf6cf75c7 100644 --- a/Makefile +++ b/Makefile @@ -21,12 +21,12 @@ docker-compose: docker-compose up geth: - $(GOBUILD) -o $(GOBIN)/tg -ldflags "-X main.GitCommit=${GIT_COMMIT} -X main.GitDate=$(shell date +%Y.%m.%d.%H%M%S)" ./cmd/tg + $(GOBUILD) -o $(GOBIN)/tg -ldflags "-X main.gitCommit=${GIT_COMMIT}" ./cmd/tg @echo "Done building." @echo "Run \"$(GOBIN)/tg\" to launch turbo-geth." tg: - $(GOBUILD) -o $(GOBIN)/tg -ldflags "-X main.GitCommit=${GIT_COMMIT} -X main.GitDate=$(shell date +%Y.%m.%d.%H%M%S)" ./cmd/tg + $(GOBUILD) -o $(GOBIN)/tg -ldflags "-X main.gitCommit=${GIT_COMMIT}" ./cmd/tg @echo "Done building." @echo "Run \"$(GOBIN)/tg\" to launch turbo-geth." diff --git a/cmd/tg/main.go b/cmd/tg/main.go index 0c87df602d..32acb90512 100644 --- a/cmd/tg/main.go +++ b/cmd/tg/main.go @@ -14,8 +14,7 @@ import ( ) var ( - GitCommit string - GitDate string + gitCommit string ) func main() { @@ -31,7 +30,7 @@ func runTurboGeth(ctx *cli.Context) { stagedsync.DefaultUnwindOrder(), ) - tg := node.New(ctx, sync, node.Params{GitCommit: GitCommit, GitDate: GitDate}) + tg := node.New(ctx, sync, node.Params{GitCommit: gitCommit}) err := tg.Serve() if err != nil { diff --git a/turbo/node/node.go b/turbo/node/node.go index c9a56cfecd..98f1e94d95 100644 --- a/turbo/node/node.go +++ b/turbo/node/node.go @@ -43,7 +43,6 @@ func (tg *TurboGethNode) run() { } type Params struct { - GitDate string GitCommit string CustomBuckets dbutils.BucketsCfg } @@ -75,8 +74,8 @@ func makeEthConfig(ctx *cli.Context, node *node.Node) *eth.Config { func makeNodeConfig(ctx *cli.Context, p Params) *node.Config { nodeConfig := node.DefaultConfig // see simiar changes in `cmd/geth/config.go#defaultNodeConfig` - if commit, date := p.GitCommit, p.GitDate; commit != "" && date != "" { - nodeConfig.Version = params.VersionWithCommit(commit, date) + if commit := p.GitCommit; commit != "" { + nodeConfig.Version = params.VersionWithCommit(commit, "") } else { nodeConfig.Version = params.Version } -- GitLab