Refactor Makefile and goreleaser file.

Author: knadh

.goreleaser.yml

@@ -6,6 +6,7 @@ builds:
   - binary: dictpress
     main: ./cmd/dictpress
     goos:
+      - windows
       - darwin
       - linux
       - freebsd
@@ -14,7 +15,7 @@ builds:
     goarch:
       - amd64
     ldflags:
-      - -s -w -X "main.buildString={{ .Tag }} ({{ .ShortCommit }} {{ .Date }})"
+      - -s -w -X "main.buildString={{ .Tag }} ({{ .ShortCommit }} {{ .Date }})" -X "main.versionString={{ .Tag }}"
 
     hooks:
       # stuff executables with static assets.
@@ -25,3 +26,4 @@ archives:
     files:
       - README.md
       - LICENSE
+      - site

Makefile

@@ -1,33 +1,44 @@
-LAST_COMMIT := $(shell git rev-parse --short HEAD)
-VERSION := $(shell git describe --tags --abbrev=0)
-BUILDSTR := \#${LAST_COMMIT} $(shell date -u +"%Y-%m-%dT%H:%M:%S%z")
+# Try to get the commit hash from 1) git 2) the VERSION file 3) fallback.
+LAST_COMMIT := $(or $(shell git rev-parse --short HEAD 2> /dev/null),$(shell head -n 1 VERSION | grep -oP -m 1 "^[a-z0-9]+$$"),"UNKNOWN")
 
-STATIC := config.sample.toml schema.sql queries.sql admin
-BIN := dictpress
+# Try to get the semver from 1) git 2) the VERSION file 3) fallback.
+VERSION := $(or $(shell git describe --tags --abbrev=0 2> /dev/null),$(shell grep -oP "tag: \K(.*)(?=,)" VERSION),"v0.0.0")
+
+BUILDSTR := ${VERSION} (\#${LAST_COMMIT} $(shell date -u +"%Y-%m-%dT%H:%M:%S%z"))
 
-# Install dependencies needed for building
-.PHONY: deps
-deps:
-	go get -u github.com/knadh/stuffbin/...
+YARN ?= yarn
+GOPATH ?= $(HOME)/go
+STUFFBIN ?= $(GOPATH)/bin/stuffbin
+
+BIN := dictpress
+STATIC := config.sample.toml schema.sql queries.sql admin
 
 .PHONY: build
-build:
-	go build -o ${BIN} -ldflags="-s -w -X 'main.buildString=${BUILDSTR}' -X 'main.versionString=${VERSION}'" cmd/${BIN}/*.go
+build: $(BIN)
+
+$(STUFFBIN):
+	go install github.com/knadh/stuffbin/...
+
+$(BIN): $(shell find . -type f -name "*.go")
+	CGO_ENABLED=0 go build -o ${BIN} -ldflags="-s -w -X 'main.buildString=${BUILDSTR}' -X 'main.versionString=${VERSION}'" cmd/${BIN}/*.go
 
 .PHONY: run
 run:
-	go run -ldflags="-s -w -X 'main.buildString=${BUILDSTR}'" cmd/${BIN}/*.go
+	CGO_ENABLED=0 go run -ldflags="-s -w -X 'main.buildString=${BUILDSTR}' -X 'main.versionString=${VERSION}'" cmd/${BIN}/*.go
+
+# Run Go tests.
+.PHONY: test
+test:
+	go test ./...
 
-# Compile bin and bundle static assets.
 .PHONY: dist
-dist: build
-	stuffbin -a stuff -in ${BIN} -out ${BIN} ${STATIC}
+dist: $(STUFFBIN) build pack-bin
 
-# pack-releases runn stuffbin packing on the given binary. This is used
+# pack-releases runns stuffbin packing on the given binary. This is used
 # in the .goreleaser post-build hook.
 .PHONY: pack-bin
-pack-bin:
-	stuffbin -a stuff -in ${BIN} -out ${BIN} ${STATIC}
+pack-bin: $(BIN) $(STUFFBIN)
+	$(STUFFBIN) -a stuff -in ${BIN} -out ${BIN} ${STATIC}
 
 # Use goreleaser to do a dry run producing local builds.
 .PHONY: release-dry
@@ -38,5 +49,3 @@ release-dry:
 .PHONY: release
 release:
 	goreleaser --parallelism 1 --rm-dist --skip-validate
-
-.DEFAULT_GOAL := dist

cmd/dictpress/install.go

@@ -10,7 +10,7 @@ func installSchema(app *App, prompt bool) {
 	if prompt {
 		fmt.Println("")
 		fmt.Println("** first time installation **")
-		fmt.Printf("** IMPORTANT: This will wipe existing dictmaker tables and types in the DB '%s' **",
+		fmt.Printf("** IMPORTANT: This will wipe existing tables and types in the DB '%s' **",
 			ko.String("db.db"))
 		fmt.Println("")
 

cmd/dictpress/main.go

@@ -82,7 +82,7 @@ func init() {
 	}
 
 	if ok, _ := f.GetBool("version"); ok {
-		fmt.Printf("%s (%s)\n", versionString, buildString)
+		fmt.Println(buildString)
 		os.Exit(0)
 	}