From 741dd16e1fbf2c2ffe3f0a092623edd3bf877013 Mon Sep 17 00:00:00 2001 From: "Flynn, Jenny" Date: Tue, 29 May 2018 13:30:58 +0100 Subject: [PATCH 1/2] version wrapped with brackets --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d009467..02634bf 100644 --- a/Makefile +++ b/Makefile @@ -4,5 +4,5 @@ containerbin: export PKG_CONFIG_PATH=$GOPATH/src/github.com/xtracdev/es-atom-replicator/pkgconfig/ go test gucumber - GOOS=linux GOARCH=amd64 go build -ldflags "-s -X github.com/xtracdev/es-atom-replicator/health.Version=$CIRCLE_BUILD_NUM" -a -installsuffix cgo -o replicator ./cmd/ + GOOS=linux GOARCH=amd64 go build -ldflags "-s -X github.com/xtracdev/es-atom-replicator/health.Version=$(CIRCLE_BUILD_NUM)" -a -installsuffix cgo -o replicator ./cmd/ cp replicator /artifacts From 9129ec8406e8c6f57c06e47a7339b06f6ae749e2 Mon Sep 17 00:00:00 2001 From: "Flynn, Jenny" Date: Tue, 29 May 2018 13:36:57 +0100 Subject: [PATCH 2/2] set version build number --- Makefile | 4 ++-- circle.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 02634bf..e8133b4 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ -CIRCLE_BUILD_NUM ?= 1 +VERSION_BUILD ?= 1 containerbin: go get github.com/gucumber/gucumber/cmd/gucumber export PKG_CONFIG_PATH=$GOPATH/src/github.com/xtracdev/es-atom-replicator/pkgconfig/ go test gucumber - GOOS=linux GOARCH=amd64 go build -ldflags "-s -X github.com/xtracdev/es-atom-replicator/health.Version=$(CIRCLE_BUILD_NUM)" -a -installsuffix cgo -o replicator ./cmd/ + GOOS=linux GOARCH=amd64 go build -ldflags "-s -X github.com/xtracdev/es-atom-replicator/health.Version=$(VERSION_BUILD)" -a -installsuffix cgo -o replicator ./cmd/ cp replicator /artifacts diff --git a/circle.yml b/circle.yml index 38b76a7..16187f3 100644 --- a/circle.yml +++ b/circle.yml @@ -4,7 +4,7 @@ machine: dependencies: override: - - docker run --rm -v "$PWD":/go/src/github.com/xtracdev/es-atom-replicator -v "$CIRCLE_ARTIFACTS":/artifacts -e DB_USER=$DB_USER -e DB_PASSWORD=$DB_PASSWORD -e DB_HOST=$DB_HOST -e DB_PORT=$DB_PORT -e DB_SVC=$DB_SVC -w /go/src/github.com/xtracdev/es-atom-replicator xtracdev/goora bash -c make + - docker run --rm -v "$PWD":/go/src/github.com/xtracdev/es-atom-replicator -v "$CIRCLE_ARTIFACTS":/artifacts -e VERSION_BUILD=$CIRCLE_BUILD_NUM -e DB_USER=$DB_USER -e DB_PASSWORD=$DB_PASSWORD -e DB_HOST=$DB_HOST -e DB_PORT=$DB_PORT -e DB_SVC=$DB_SVC -w /go/src/github.com/xtracdev/es-atom-replicator xtracdev/goora bash -c make test: override: