Skip to content

Commit 806f60b

Browse files
authored
fix version and commit sha in tray menu (#563)
* fix commit version not being passed correctly during compile process * add tag and polishing
1 parent 9f3cb8b commit 806f60b

File tree

3 files changed

+27
-7
lines changed

3 files changed

+27
-7
lines changed

Diff for: Taskfile.yml

+7-4
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,18 @@ vars:
4141
# build vars
4242
COMMIT:
4343
sh: echo ${TRAVIS_COMMIT:-`git log -n 1 --format=%h`}
44+
TAG:
45+
sh: echo `git describe --tags --abbrev=0`
4446
LDFLAGS: >
45-
-ldflags '-X github.com/arduino/arduino-create-agent/version.commit={{.COMMIT}}'
47+
-ldflags '-X main.version={{.TAG}}
48+
-X main.git_revision={{.COMMIT}}'
4649
# test vars
4750
GOFLAGS: "-timeout 10m -v -coverpkg=./... -covermode=atomic"
48-
TEST_VERSIONSTRING: "0.0.0-test.preview"
51+
TEST_VERSIONSTRING: "0.0.0-alpha"
4952
TEST_COMMIT: "deadbeef"
5053
TEST_LDFLAGS: >
51-
-ldflags '-X github.com/arduino/arduino-create-agent/version.versionString={{.TEST_VERSIONSTRING}}
52-
-X github.com/arduino/arduino-create-agent/version.commit={{.TEST_COMMIT}}'
54+
-ldflags '-X main.version={{.TEST_VERSIONSTRING}}
55+
-X main.git_revision={{.TEST_COMMIT}}'
5356
# check-lint vars
5457
GOLINTBIN:
5558
sh: go list -f {{"{{"}}".Target{{"}}"}}" golang.org/x/lint/golint

Diff for: go.mod

+4-3
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,11 @@ require (
5656
go.bug.st/downloader v0.0.0-20181116113543-9b8976a44d87
5757
go.bug.st/serial.v1 v0.0.0-20180827123349-5f7892a7bb45
5858
goa.design/goa v1.0.1-0.20190116060309-40843d63b0e4
59-
golang.org/x/crypto v0.0.0-20181112202954-3d3f9f413869
60-
golang.org/x/net v0.0.0-20181114220301-adae6a3d119a
59+
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550
60+
golang.org/x/lint v0.0.0-20200302205851-738671d3881b // indirect
61+
golang.org/x/net v0.0.0-20190620200207-3b0461eec859
6162
golang.org/x/sys v0.0.0-20200107162124-548cf772de50
62-
golang.org/x/tools v0.0.0-20190116231616-b258f6da2383
63+
golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7
6364
gopkg.in/Knetic/govaluate.v3 v3.0.0
6465
gopkg.in/go-playground/validator.v8 v8.18.1
6566
gopkg.in/h2non/filetype.v1 v1.0.5

Diff for: go.sum

+16
Original file line numberDiff line numberDiff line change
@@ -113,14 +113,30 @@ goa.design/goa v1.0.1-0.20190116060309-40843d63b0e4/go.mod h1:NnzBwdNktihbNek+pP
113113
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
114114
golang.org/x/crypto v0.0.0-20181112202954-3d3f9f413869 h1:kkXA53yGe04D0adEYJwEVQjeBppL01Exg+fnMjfUraU=
115115
golang.org/x/crypto v0.0.0-20181112202954-3d3f9f413869/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
116+
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
117+
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 h1:ObdrDkeb4kJdCP557AjRjq69pTHfNouLtWZG7j9rPN8=
118+
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
119+
golang.org/x/lint v0.0.0-20200302205851-738671d3881b h1:Wh+f8QHJXR411sJR8/vRBTZ7YapZaRvUcLFFJhusH0k=
120+
golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
121+
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
116122
golang.org/x/net v0.0.0-20181114220301-adae6a3d119a h1:gOpx8G595UYyvj8UK4+OFyY4rx037g3fmfhe5SasG3U=
117123
golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
124+
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
125+
golang.org/x/net v0.0.0-20190620200207-3b0461eec859 h1:R/3boaszxrf1GEUWTVDzSKVwLmSJpwZ1yqXm8j0v2QI=
126+
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
127+
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
118128
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
129+
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
130+
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
119131
golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
120132
golang.org/x/sys v0.0.0-20190919044723-0c1ff786ef13/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
121133
golang.org/x/sys v0.0.0-20200107162124-548cf772de50 h1:YvQ10rzcqWXLlJZ3XCUoO25savxmscf4+SC+ZqiCHhA=
122134
golang.org/x/sys v0.0.0-20200107162124-548cf772de50/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
135+
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
123136
golang.org/x/tools v0.0.0-20190116231616-b258f6da2383/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
137+
golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7 h1:EBZoQjiKKPaLbPrbpssUfuHtwM6KV/vb4U85g/cigFY=
138+
golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
139+
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
124140
gopkg.in/Knetic/govaluate.v3 v3.0.0/go.mod h1:csKLBORsPbafmSCGTEh3U7Ozmsuq8ZSIlKk1bcqph0E=
125141
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
126142
gopkg.in/go-playground/validator.v8 v8.18.1 h1:F8SLY5Vqesjs1nI1EL4qmF1PQZ1sitsmq0rPYXLyfGU=

0 commit comments

Comments
 (0)