From f7c952f8cab46a568655e111f250366f1a0a4494 Mon Sep 17 00:00:00 2001 From: c9s Date: Mon, 22 Feb 2021 15:16:12 +0800 Subject: [PATCH] add version files --- Makefile | 15 ++++++++++----- pkg/exchange/max/maxapi/restapi.go | 5 +++-- pkg/version/dev.go | 5 +++++ pkg/version/version.go | 6 ++++++ utils/generate-version-file.sh | 13 +++++++++++++ 5 files changed, 37 insertions(+), 7 deletions(-) create mode 100644 pkg/version/dev.go create mode 100644 pkg/version/version.go create mode 100644 utils/generate-version-file.sh diff --git a/Makefile b/Makefile index 2a4b44507..30fde38bc 100644 --- a/Makefile +++ b/Makefile @@ -21,16 +21,16 @@ $(BIN_DIR): mkdir -p $@ bbgo-linux: $(BIN_DIR) - GOOS=linux GOARCH=$(TARGET_ARCH) go build -tags web -o $(BIN_DIR)/$@ ./cmd/bbgo + GOOS=linux GOARCH=$(TARGET_ARCH) go build -tags web,release -o $(BIN_DIR)/$@ ./cmd/bbgo bbgo-darwin: $(BIN_DIR) - GOOS=darwin GOARCH=$(TARGET_ARCH) go build -tags web -o $(BIN_DIR)/$@ ./cmd/bbgo + GOOS=darwin GOARCH=$(TARGET_ARCH) go build -tags web,release -o $(BIN_DIR)/$@ ./cmd/bbgo bbgo-darwin-slim: $(BIN_DIR) - GOOS=darwin GOARCH=$(TARGET_ARCH) go build -o $(BIN_DIR)/$@ ./cmd/bbgo + GOOS=darwin GOARCH=$(TARGET_ARCH) go build -tags release -o $(BIN_DIR)/$@ ./cmd/bbgo bbgo-linux-slim: $(BIN_DIR) - GOOS=linux GOARCH=$(TARGET_ARCH) go build -o $(BIN_DIR)/$@ ./cmd/bbgo + GOOS=linux GOARCH=$(TARGET_ARCH) go build -tags release -o $(BIN_DIR)/$@ ./cmd/bbgo clean: rm -rf $(BUILD_DIR) $(DIST_DIR) $(FRONTEND_EXPORT_DIR) @@ -63,6 +63,11 @@ dist: static bbgo-linux bbgo-linux-slim bbgo-darwin bbgo-darwin-slim desktop mkdir -p $(DIST_DIR) tar -C $(BUILD_DIR) -cvzf $(DIST_DIR)/bbgo-$$(git describe --tags).tar.gz . +pkg/version/version.go: .git/HEAD + bash utils/generate-version-file.sh > $@ + +version: pkg/version/version.go + migrations: rockhopper compile --config rockhopper_mysql.yaml --output pkg/migrations/mysql rockhopper compile --config rockhopper_sqlite.yaml --output pkg/migrations/sqlite3 @@ -87,4 +92,4 @@ embed: pkg/server/assets.go static: frontend/out/index.html pkg/server/assets.go -.PHONY: bbgo dist migrations static embed desktop .FORCE +.PHONY: bbgo version dist migrations static embed desktop .FORCE diff --git a/pkg/exchange/max/maxapi/restapi.go b/pkg/exchange/max/maxapi/restapi.go index 000ba91bb..1effd73cf 100644 --- a/pkg/exchange/max/maxapi/restapi.go +++ b/pkg/exchange/max/maxapi/restapi.go @@ -22,15 +22,16 @@ import ( log "github.com/sirupsen/logrus" "github.com/c9s/bbgo/pkg/util" + "github.com/c9s/bbgo/pkg/version" ) const ( // ProductionAPIURL is the official MAX API v2 Endpoint ProductionAPIURL = "https://max-api.maicoin.com/api/v2" - UserAgent = "bbgo/1.0" + UserAgent = "bbgo/" + version.Version - defaultHTTPTimeout = time.Second * 15 + defaultHTTPTimeout = time.Second * 30 ) var logger = log.WithField("exchange", "max") diff --git a/pkg/version/dev.go b/pkg/version/dev.go new file mode 100644 index 000000000..63e65c50e --- /dev/null +++ b/pkg/version/dev.go @@ -0,0 +1,5 @@ +// +build !release + +package version + +const Version = "1.x-dev" diff --git a/pkg/version/version.go b/pkg/version/version.go new file mode 100644 index 000000000..ec16643b7 --- /dev/null +++ b/pkg/version/version.go @@ -0,0 +1,6 @@ +// +build release + +package version + +const Version = "v1.11.1-32-g1e205b1" + diff --git a/utils/generate-version-file.sh b/utils/generate-version-file.sh new file mode 100644 index 000000000..7d663b1d5 --- /dev/null +++ b/utils/generate-version-file.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +packageName=version +version=$(git describe --tags) + +cat <