Merge pull request #3 from oldthreefeng/develop

add makefile

Author: oldthreefeng

Makefile

@@ -0,0 +1,64 @@
+LDFLAGS += -X "github.com/oldthreefeng/stress/cmd.BuildTime=$(shell date '+%F %T')"
+LDFLAGS += -X "github.com/oldthreefeng/stress/cmd.Build=$(shell git rev-parse --short HEAD)"
+LDFLAGS += -X "github.com/oldthreefeng/stress/cmd.Version=latest"
+LDFLAGS += -X "github.com/oldthreefeng/stress/cmd.GoVersion=$(shell go version)"
+BRANCH := $(shell git symbolic-ref HEAD 2>/dev/null | cut -d"/" -f 3)
+BUILD := $(shell git rev-parse --short HEAD)
+NEWTAG := $(shell git describe --tags `git rev-list --tags --max-count=1` || echo "1.0.0")
+VERSION = $(NEWTAG)-$(BUILD)
+
+BASEPATH := $(shell pwd)
+CGO_ENABLED = 0
+GOCMD = go
+GOBUILD = $(GOCMD) build
+GOTEST = $(GOCMD) test
+GOMOD = $(GOCMD) mod
+GOFILES = $(shell find . -name "*.go" -type f )
+
+NAME := stress
+DIRNAME := output/bin
+SRCFILE= main.go
+SOFTWARENAME=$(NAME)-$(VERSION)
+
+PLATFORMS := windows darwin linux
+
+.PHONY: fmt
+fmt:
+	@gofmt -s -w ${GOFILES}
+
+.PHONY: test
+test: deps
+	$(GOTEST) -v ./...
+
+.PHONY: deps
+deps:
+	$(GOMOD) tidy
+	$(GOMOD) download
+
+.PHONY: release
+release: windows darwin linux
+
+BUILDDIR:=$(BASEPATH)/output
+
+.PHONY:Asset
+Asset:
+	@[ -d $(BUILDDIR) ] || mkdir -p $(BUILDDIR)
+	@[ -d $(DIRNAME) ] || mkdir -p $(DIRNAME)
+
+.PHONY: $(PLATFORMS)
+$(PLATFORMS): Asset deps
+	@echo "编译" $@
+	GOOS=$@ GOARCH=amd64 CGO_ENABLED=0 GO111MODULE=on GOPROXY=https://goproxy.cn $(GOBUILD) -ldflags '$(LDFLAGS)'  -o $(NAME) $(SRCFILE)
+	cp -f $(NAME) $(DIRNAME)
+	tar czvf $(BUILDDIR)/$(SOFTWARENAME)-$@-amd64.tar.gz $(DIRNAME)
+
+.PHONY: clean
+clean:
+	-rm -rf $(NAME)
+	-rm -rf $(BUILDDIR)
+
+.PHONY: push
+push: clean
+	git add .
+	git commit -m "$m"
+	git push origin develop

build.sh

@@ -1,3 +1,4 @@
 COMMIT_SHA1=$(git rev-parse --short HEAD || echo "0.0.0")
 BUILD_TIME=$(date "+%F %T")
-go build -o stress -ldflags "-X github.com/oldthreefeng/stress/cmd.Version=$1 -X github.com/oldthreefeng/stress/cmd.Build=${COMMIT_SHA1} -X 'github.com/oldthreefeng/stress/cmd.BuildTime=${BUILD_TIME}'" main.go
+GO_VERSION=$(go version)
+go build -o stress -ldflags "-X github.com/oldthreefeng/stress/cmd.Version=$1 -X  github.com/oldthreefeng/stress/cmd.GoVersion=${GO_VERSION} -X github.com/oldthreefeng/stress/cmd.Build=${COMMIT_SHA1} -X 'github.com/oldthreefeng/stress/cmd.BuildTime=${BUILD_TIME}'" main.go

cmd/version.go

@@ -17,8 +17,6 @@ package cmd
 
 import (
 	"fmt"
-	"runtime"
-
 	"github.com/spf13/cobra"
 )
 
@@ -50,5 +48,6 @@ var (
 	Version    = "latest"
 	Build      = ""
 	BuildTime  = ""
-	VersionStr = fmt.Sprintf("stress version: %v, build git hash: %v ,Go version: %v, Build Time : %v", Version, Build, runtime.Version(), BuildTime)
+	GoVersion  = ""
+	VersionStr = fmt.Sprintf("stress version: %v, build git hash: %v ,%v, Build Time : %v", Version, Build, GoVersion, BuildTime)
 )