Skip to content

Commit

Permalink
Fix version for deb package and docker image
Browse files Browse the repository at this point in the history
  • Loading branch information
raoptimus committed Nov 30, 2020
1 parent c70f0d1 commit 9919e27
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ BASEDIR=$(shell pwd)
GIT_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)
GIT_COMMIT ?= $(shell git rev-parse --short HEAD)
GIT_TAG ?= $(shell git describe --tags --abbrev=0 HEAD 2>/dev/null || false)
VERSION ?= $(shell [[ "${GIT_TAG}" == "" ]] && echo 0.0.1 || echo ${GIT_TAG})
VERSION ?= $(shell [[ "${GIT_TAG}" == "" ]] && echo 0.0.1 || echo ${GIT_TAG} | tr -d v)
export ${VERSION}
LDFLAGS=-ldflags "-s -w -X main.Version=${GIT_TAG} -X main.GitCommit=${GIT_COMMIT}"
COVERAGE_DIR ?= .coverage
Expand Down Expand Up @@ -56,8 +56,7 @@ test:
-covermode=atomic \
-coverprofile=${COVERAGE_DIR}/coverage.txt $(SOURCE_FILES) \
-run $(TEST_PATTERN) \
-timeout=2m \
-v
-timeout=2m

build-deb: build
@echo "deb package $(PKG_NAME) building..."
Expand Down

0 comments on commit 9919e27

Please sign in to comment.