diff --git a/Makefile b/Makefile index f203d08d..44ee9792 100644 --- a/Makefile +++ b/Makefile @@ -2,10 +2,15 @@ NOW = $(shell date -u '+%Y%m%d%I%M%S') -RELEASE_VERSION = 5.9.6 APP = n9e SERVER_BIN = $(APP) +ROOT:=$(shell pwd -P) +GIT_COMMIT:=$(shell git --work-tree ${ROOT} rev-parse 'HEAD^{commit}') +_GIT_VERSION:=$(shell git --work-tree ${ROOT} describe --tags --abbrev=14 "${GIT_COMMIT}^{commit}" 2>/dev/null) +TAG=$(shell echo "${_GIT_VERSION}" | awk -F"-" '{print $$1}') +RELEASE_VERSION:="$(TAG)-$(GIT_COMMIT)" + # RELEASE_ROOT = release # RELEASE_SERVER = release/${APP} # GIT_COUNT = $(shell git rev-list --all --count) @@ -17,6 +22,9 @@ all: build build: go build -ldflags "-w -s -X github.com/didi/nightingale/v5/src/pkg/version.VERSION=$(RELEASE_VERSION)" -o $(SERVER_BIN) ./src +build-linux: + GOOS=linux GOARCH=amd64 go build -ldflags "-w -s -X github.com/didi/nightingale/v5/src/pkg/version.VERSION=$(RELEASE_VERSION)" -o $(SERVER_BIN) ./src + # start: # @go run -ldflags "-X main.VERSION=$(RELEASE_TAG)" ./cmd/${APP}/main.go web -c ./configs/config.toml -m ./configs/model.conf --menu ./configs/menu.yaml run_webapi: