From 4e22f6e0b9e405a61fcdd1b41b57bc0d9c19b69b Mon Sep 17 00:00:00 2001 From: Roberto Sora Date: Wed, 18 Sep 2019 17:50:26 +0200 Subject: [PATCH 1/2] replace default dummy version that overlaps with a real version with an explicit dummy version --- Taskfile.yml | 2 +- version/version.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Taskfile.yml b/Taskfile.yml index d8b30149aa2..0581acd4c3d 100755 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -63,7 +63,7 @@ vars: sh: echo `go list ./... | grep -v legacy | tr '\n' ' '` # build vars - VERSIONSTRING: "0.3.7-alpha.preview" + VERSIONSTRING: "0.0.0-git" COMMIT: sh: echo ${TRAVIS_COMMIT:-`git log -n 1 --format=%h`} LDFLAGS: > diff --git a/version/version.go b/version/version.go index 22700de2614..877245969b3 100644 --- a/version/version.go +++ b/version/version.go @@ -22,7 +22,7 @@ import ( ) var ( - defaultVersionString = "0.3.7-alpha.preview" + defaultVersionString = "0.0.0-git" versionString = "" commit = "" ) From cd535e37536eef45c7e270dfa18a31a72a9afb00 Mon Sep 17 00:00:00 2001 From: Roberto Sora Date: Wed, 18 Sep 2019 18:01:58 +0200 Subject: [PATCH 2/2] remove redundant VERSIONSTRING build var from taskfile --- Taskfile.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Taskfile.yml b/Taskfile.yml index 0581acd4c3d..86f4f2b218a 100755 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -63,12 +63,10 @@ vars: sh: echo `go list ./... | grep -v legacy | tr '\n' ' '` # build vars - VERSIONSTRING: "0.0.0-git" COMMIT: sh: echo ${TRAVIS_COMMIT:-`git log -n 1 --format=%h`} LDFLAGS: > - -ldflags '-X github.com/arduino/arduino-cli/version.versionString={{.VERSIONSTRING}} - -X github.com/arduino/arduino-cli/version.commit={{.COMMIT}}' + -ldflags '-X github.com/arduino/arduino-cli/version.commit={{.COMMIT}}' # test vars GOFLAGS: "-timeout 10m -v -coverpkg=./... -covermode=atomic"