Added build & release makefiles

.gitignore

@@ -18,4 +18,8 @@
 # vendor/
 
 # Go workspace file
-go.work
+go.work
+
+# build and files
+.build/
+.release/

Makefile

@@ -0,0 +1,21 @@
+# Makefile for building Tork
+GITCOMMIT:=$(shell git describe --dirty --always)
+BINARY:=tork
+SYSTEM:=
+CHECKS:=check
+BUILDOPTS:=-v
+GOPATH?=$(HOME)/go
+MAKEPWD:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+CGO_ENABLED?=0
+
+.PHONY: all
+all: tork
+
+.PHONY: tork
+tork: 
+	CGO_ENABLED=$(CGO_ENABLED) $(SYSTEM) go build $(BUILDOPTS) -ldflags="-s -w -X github.com/runabol/tork/version.GitCommit=$(GITCOMMIT)" -o $(BINARY) ./cmd/main.go 
+
+.PHONY: clean
+clean:
+	go clean
+	rm -f tork

Makefile.release

@@ -0,0 +1,87 @@
+# Makefile for releasing Tork
+#
+# The release is controlled from version/version.go. The version found there is
+# used to tag the git repo and to build the assets that are uploaded to GitHub.
+#
+# Steps to release: 
+# 1. make -f Makefile.release release
+# 2. make -f Makefile.release github-push
+
+ifeq (, $(shell which curl))
+    $(error "No curl in $$PATH, please install")
+endif
+
+NAME:=tork
+VERSION:=$(shell grep 'Version' version/version.go | awk '{ print $$3 }' | tr -d '"')
+GITHUB:=runabol
+LINUX_ARCH:=amd64 arm arm64 mips64le ppc64le s390x mips riscv64
+
+all:
+	@echo Use the 'release' target to build a release
+
+release: build tar
+
+.PHONY: build
+build:
+	@go version
+	@echo Cleaning old builds
+	@rm -rf .build && mkdir .build
+	@echo Building: darwin/amd64 - $(VERSION)
+	mkdir -p .build/darwin/amd64 && $(MAKE) tork BINARY=.build/darwin/amd64/$(NAME) SYSTEM="GOOS=darwin GOARCH=amd64" BUILDOPTS=""
+	@echo Building: darwin/arm64 - $(VERSION)
+	mkdir -p .build/darwin/arm64 && $(MAKE) tork BINARY=.build/darwin/arm64/$(NAME) SYSTEM="GOOS=darwin GOARCH=arm64" BUILDOPTS=""
+	@echo Building: windows/amd64 - $(VERSION)
+	mkdir -p .build/windows/amd64 && $(MAKE) tork BINARY=.build/windows/amd64/$(NAME).exe SYSTEM="GOOS=windows GOARCH=amd64" BUILDOPTS=""
+	@echo Building: linux/$(LINUX_ARCH) - $(VERSION) ;\
+	for arch in $(LINUX_ARCH); do \
+	    mkdir -p .build/linux/$$arch  && $(MAKE) tork BINARY=.build/linux/$$arch/$(NAME) SYSTEM="GOOS=linux GOARCH=$$arch" BUILDOPTS="" ;\
+	done
+
+.PHONY: tar
+tar:
+	@echo Cleaning old releases
+	@rm -rf .release && mkdir .release
+	tar -zcf .release/$(NAME)_$(VERSION)_darwin_amd64.tgz -C .build/darwin/amd64 $(NAME)
+	tar -zcf .release/$(NAME)_$(VERSION)_darwin_arm64.tgz -C .build/darwin/arm64 $(NAME)
+	tar -zcf .release/$(NAME)_$(VERSION)_windows_amd64.tgz -C .build/windows/amd64 $(NAME).exe
+	for arch in $(LINUX_ARCH); do \
+	    tar -zcf .release/$(NAME)_$(VERSION)_linux_$$arch.tgz -C .build/linux/$$arch $(NAME) ;\
+	done
+
+.PHONY: github-push
+github-push:
+ifeq ($(GITHUB_ACCESS_TOKEN),)
+	$(error "Please set the GITHUB_ACCESS_TOKEN environment variable")
+else
+	@echo Releasing: $(VERSION)
+	@$(eval RELEASE:=$(shell curl -s -d '{"tag_name": "v$(VERSION)", "name": "v$(VERSION)"}' -H "Authorization: token ${GITHUB_ACCESS_TOKEN}" "https://api.github.com/repos/$(GITHUB)/$(NAME)/releases" | grep -m 1 '"id"' | tr -cd '[[:digit:]]'))
+	@echo ReleaseID: $(RELEASE)
+	@( cd release; for asset in `ls -A .release/*tgz`; do \
+	    echo $$asset; \
+	    curl -o /dev/null -X POST \
+	      -H "Content-Type: application/gzip" \
+	      -H "Authorization: token ${GITHUB_ACCESS_TOKEN}" \
+	      --data-binary "@$$asset" \
+	      "https://uploads.github.com/repos/$(GITHUB)/$(NAME)/releases/$(RELEASE)/assets?name=$${asset}" ; \
+	done )
+	@( cd release; for asset in `ls -A .release/*tgz`; do \
+	    sha256sum $$asset > $$asset.sha256; \
+	done )
+	@( cd release; for asset in `ls -A *sha256`; do \
+	    echo $$asset; \
+	    curl -o /dev/null -X POST \
+	      -H "Content-Type: text/plain" \
+	      -H "Authorization: token ${GITHUB_ACCESS_TOKEN}" \
+	      --data-binary "@$$asset" \
+	      "https://uploads.github.com/repos/$(GITHUB)/$(NAME)/releases/$(RELEASE)/assets?name=$${asset}" ; \
+	done )
+endif
+
+.PHONY: version
+version:
+	@echo $(VERSION)
+
+.PHONY: clean
+clean:
+	rm -rf release
+	rm -rf build

cmd/main.go

@@ -15,6 +15,7 @@ import (
 	"github.com/runabol/tork/mq"
 	"github.com/runabol/tork/runtime"
 	"github.com/runabol/tork/signals"
+	"github.com/runabol/tork/version"
 	"github.com/runabol/tork/worker"
 	"github.com/urfave/cli/v2"
 )
@@ -84,6 +85,7 @@ func main() {
 					datastoreFlag(),
 					postgresDSNFlag(),
 					logLevel(),
+					logFormat(),
 				},
 				Action: runMigration,
 			},
@@ -448,13 +450,15 @@ func logFormat() cli.Flag {
 }
 
 func getBanner() string {
-	return color.WhiteString(`
-_______  _______  ______    ___   _ 
+	return color.WhiteString(fmt.Sprintf(`
+ _______  _______  ______    ___   _ 
 |       ||       ||    _ |  |   | | |
 |_     _||   _   ||   | ||  |   |_| |
   |   |  |  | |  ||   |_||_ |      _|
   |   |  |  |_|  ||    __  ||     |_ 
   |   |  |       ||   |  | ||    _  |
   |___|  |_______||___|  |_||___| |_|
-`)
+
+ %s (%s)
+`, version.Version, version.GitCommit))
 }

signals/quit_test.go

@@ -17,7 +17,8 @@ func TestAwaitTerm(t *testing.T) {
 	}()
 	// wait for the hook
 	time.Sleep(time.Millisecond * 100)
-	syscall.Kill(syscall.Getpid(), syscall.SIGTERM)
+	err := syscall.Kill(syscall.Getpid(), syscall.SIGTERM)
+	assert.NoError(t, err)
 	// wait for termination to be caught
 	time.Sleep(time.Millisecond * 100)
 	assert.True(t, terminated)

version/version.go

@@ -0,0 +1,9 @@
+package version
+
+const (
+	Version = "0.1.0"
+)
+
+var (
+	GitCommit string = "develop"
+)