latest

Makefile

@@ -3,19 +3,17 @@ export PROGRESS_NO_TRUNC := 1
 GOPATH := $(shell go env GOPATH)
 export PATH := $(PATH):$(GOPATH)/bin
 PROTOC_GEN_GO := $(GOPATH)/bin/protoc-gen-go
-
 SOURCEFILES := mfer/*.go mfer/*.proto internal/*/*.go cmd/*/*.go go.mod go.sum
-
 ARCH := $(shell uname -m)
-GITREV := $(shell git describe --always --dirty=-dirty)
+GITREV_BUILD := $(shell bash $(PWD)/bin/gitrev.sh)
 APPNAME := mfer
+VERSION := 0.1.0
 export DOCKER_IMAGE_CACHE_DIR := $(HOME)/Library/Caches/Docker/$(APPNAME)-$(ARCH)
-
-GOLDFLAGS += -X main.Version=0.1.0
-GOLDFLAGS += -X main.Gitrev=$(GITREV)
+GOLDFLAGS += -X main.Version=$(VERSION)
+GOLDFLAGS += -X main.Gitrev=$(GITREV_BUILD)
 GOFLAGS := -ldflags "$(GOLDFLAGS)"
 
-.PHONY: docker default run ci test fixme 
+.PHONY: docker default run ci test fixme
 
 default: fmt test
 
@@ -25,7 +23,7 @@ run: ./mfer.cmd
 
 ci: test
 
-test:
+test: $(SOURCEFILES) mfer/mf.pb.go
 	go test -v --timeout 3s ./...
 
 $(PROTOC_GEN_GO):
@@ -38,9 +36,11 @@ devprereqs:
 	which gofumpt || go install -v mvdan.cc/gofumpt@latest
 	which golangci-lint || go install -v github.com/golangci/golangci-lint/cmd/golangci-lint@v1.50.1
 
-mfer.cmd: $(SOURCEFILES)
-	protoc --version
+mfer/mf.pb.go: mfer/mf.proto
 	cd mfer && go generate .
+
+mfer.cmd: $(SOURCEFILES) mfer/mf.pb.go
+	protoc --version
 	make test
 	cd cmd/mfer && go build -tags urfave_cli_no_docs -o ../../mfer.cmd $(GOFLAGS) .
 
@@ -62,7 +62,7 @@ docker: sneak-mfer.$(ARCH).docker.tzst
 
 sneak-mfer.$(ARCH).docker.tzst: $(SOURCEFILES)
 	bash -x bin/docker-prereqs.sh
-	docker build --progress plain -t sneak/mfer .
+	docker build --progress plain --build-arg GITREV=$(GITREV_BUILD) -t sneak/mfer .
 	docker save sneak/mfer | pv | zstdmt -19 > $@
 	du -sh $@