diff --git a/go.mod b/go.mod index 2e23b12..310856a 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,7 @@ module github.com/arcticicestudio/snowsaw go 1.13 require ( + github.com/Masterminds/semver/v3 v3.0.1 github.com/fatih/color v1.7.0 github.com/imdario/mergo v0.3.8 github.com/magefile/mage v1.9.0 @@ -13,5 +14,6 @@ require ( github.com/spf13/cobra v0.0.5 github.com/spf13/pflag v1.0.5 // indirect golang.org/x/sys v0.0.0-20191010194322-b09406accb47 // indirect + gopkg.in/src-d/go-git.v4 v4.13.1 gopkg.in/yaml.v3 v3.0.0-20191010095647-fc94e3f71652 ) diff --git a/go.sum b/go.sum index 379847e..394d0d5 100644 --- a/go.sum +++ b/go.sum @@ -1,19 +1,48 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/Masterminds/semver/v3 v3.0.1 h1:2kKm5lb7dKVrt5TYUiAavE6oFc1cFT0057UVGT+JqLk= +github.com/Masterminds/semver/v3 v3.0.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= +github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 h1:uSoVVbwJiQipAclBbw+8quDsfcvFjOpI5iCf4p/cqCs= +github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs= +github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA= +github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= +github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= +github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg= +github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o= github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ= +github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/gliderlabs/ssh v0.2.2 h1:6zsha5zo/TWhRhwqCD3+EarCAgZ2yN28ipRnGPnwkI0= +github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= +github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/imdario/mergo v0.3.8 h1:CGgOkSJeqMRmt0D9XLWExdT4m4F1vd3FV3VPt+0VxkQ= github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= +github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= +github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= +github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd h1:Coekwdh0v2wtGp9Gmz1Ze3eVRAWJMLokvN3QjdzCHLY= +github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= +github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/magefile/mage v1.9.0 h1:t3AU2wNwehMCW97vuqQLtw6puppWXHO+O2MHo5a50XE= github.com/magefile/mage v1.9.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= @@ -27,10 +56,15 @@ github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/pelletier/go-buffruneio v0.2.0/go.mod h1:JkE26KsDizTr40EUHkXVtNPvgGtbSNq5BcowyYOWdKo= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= +github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= +github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ= +github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s= @@ -41,20 +75,55 @@ github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnIn github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= +github.com/src-d/gcfg v1.4.0 h1:xXbNR5AlLSA315x2UO+fTSSAXCDf+Ar38/6oyGbDKQ4= +github.com/src-d/gcfg v1.4.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jWoI= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= +github.com/xanzy/ssh-agent v0.2.1 h1:TCbipTQL2JiiCprBWx9frJ2eJlCYT00NmctrHxVAr70= +github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0Bx9h2kr4= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 h1:HuIa8hRrWRSrqYzx1qI49NNxhdi2PrY7gxVSq1JjLDc= +golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190724013045-ca1201d0de80 h1:Ao/3l156eZf2AW5wK8a7/smtodRU+gha3+BeqJ69lRk= +golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223 h1:DH4skfRX4EBpamg7iV4ZlCpblAHI6s6TDM39bFZumv8= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191010194322-b09406accb47 h1:/XfQ9z7ib8eEJX2hdgFTZJ/ntt0swNk5oYBziWeTCvY= golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190729092621-ff9f1409240a/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/src-d/go-billy.v4 v4.3.2 h1:0SQA1pRztfTFx2miS8sA97XvooFeNOmvUenF4o0EcVg= +gopkg.in/src-d/go-billy.v4 v4.3.2/go.mod h1:nDjArDMp+XMs1aFAESLRjfGSgfvoYN0hDfzEk0GjC98= +gopkg.in/src-d/go-git-fixtures.v3 v3.5.0 h1:ivZFOIltbce2Mo8IjzUHAFoq/IylO9WHhNOAJK+LsJg= +gopkg.in/src-d/go-git-fixtures.v3 v3.5.0/go.mod h1:dLBcvytrw/TYZsNTWCnkNF2DSIlzWYqTe3rJR56Ac7g= +gopkg.in/src-d/go-git.v4 v4.13.1 h1:SRtFyV8Kxc0UP7aCHcijOMQGPxHSmMOPrzulQWolkYE= +gopkg.in/src-d/go-git.v4 v4.13.1/go.mod h1:nx5NYcxdKxq5fpltdHnPa2Exj4Sx0EclMWZQbYDu2z8= +gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME= +gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20191010095647-fc94e3f71652 h1:VKvJ/mQ4BgCjZUDggYFxTe0qv9jPMHsZPD4Xt91Y5H4= diff --git a/magefile.go b/magefile.go index 9e57a87..d95ae44 100644 --- a/magefile.go +++ b/magefile.go @@ -19,6 +19,7 @@ package main import ( + "bytes" "fmt" "go/build" "os" @@ -28,10 +29,16 @@ import ( "strings" "time" + "github.com/Masterminds/semver/v3" "github.com/fatih/color" "github.com/magefile/mage/mg" "github.com/magefile/mage/sh" + "gopkg.in/src-d/go-git.v4" + "gopkg.in/src-d/go-git.v4/plumbing" + "gopkg.in/src-d/go-git.v4/plumbing/object" + "gopkg.in/src-d/go-git.v4/plumbing/storer" + "github.com/arcticicestudio/snowsaw/pkg/config" "github.com/arcticicestudio/snowsaw/pkg/prt" ) @@ -84,8 +91,8 @@ var ( // The tool used to cross-compile the project asynchronously. // See https://github.com/mitchellh/gox for more details. crossCompileTool = &buildDependency{ - BinaryName: "gox", - ModuleName: "github.com/mitchellh/gox", + BinaryName: "gox", + ModuleName: "github.com/mitchellh/gox", ModuleVersion: "v1.0.1", } @@ -110,7 +117,7 @@ var ( // The tool used to format all Go source files. // See https://godoc.org/golang.org/x/tools/cmd/goimports for more details. formatTool = &buildDependency{ - BinaryName: "goimports", + BinaryName: "goimports", ModuleName: "golang.org/x/tools/cmd/goimports", } @@ -131,8 +138,8 @@ var ( // This is the same tool used by the https://golangci.com service that is also integrated in snowsaw's CI/CD pipeline. // See https://github.com/golangci/golangci-lint for more details. lintTool = &buildDependency{ - BinaryName: "golangci-lint", - ModuleName: "github.com/golangci/golangci-lint/cmd/golangci-lint", + BinaryName: "golangci-lint", + ModuleName: "github.com/golangci/golangci-lint/cmd/golangci-lint", ModuleVersion: "v1.19.1", } @@ -367,6 +374,163 @@ func createDirectoryStructure(paths ...string) { } } +// getAppVersionFromGit assembles the version of the application from the metadata of the Git repository. +// It searches for the latest "SemVer" compatible version tag in the current branch and falls back to the default +// version from the application configuration if none is found. +// If at least one tag is found but it is not the latest commit of the current branch, the build metadata will be +// appended, consisting of the amount of commits ahead and the shortened reference hash (8 digits) of the latest commit +// from the current branch. +// This function is a early implementation of the Git `describe` command because support in `go-git` has not been +// implemented yet. See the full compatibility comparision documentation with Git at +// https://github.com/src-d/go-git/blob/master/COMPATIBILITY.md as well as the proposed Git `describe` command +// implementation at https://github.com/src-d/go-git/pull/816 for more details. +func getAppVersionFromGit() (string, error) { + // Open the repository in the current working directory. + repo, repoOpenErr := git.PlainOpen(".") + if repoOpenErr != nil { + return "", repoOpenErr + } + + // Find the latest commit reference of the current branch. + branchRefs, repoBranchErr := repo.Branches() + if repoBranchErr != nil { + return "", repoBranchErr + } + headRef, repoHeadErr := repo.Head() + if repoHeadErr != nil { + return "", repoHeadErr + } + var currentBranchRef plumbing.Reference + branchRefIterErr := branchRefs.ForEach(func(branchRef *plumbing.Reference) error { + if branchRef.Hash() == headRef.Hash() { + currentBranchRef = *branchRef + return nil + } + return nil + }) + if branchRefIterErr != nil { + return "", branchRefIterErr + } + + // Find all commits in the repository starting from the HEAD of the current branch. + commitIterator, commitIterErr := repo.Log(&git.LogOptions{ + From: currentBranchRef.Hash(), + Order: git.LogOrderCommitterTime, + }) + if commitIterErr != nil { + return "", commitIterErr + } + + // Query all tags and store them in a temporary map. + tagIterator, repoTagsErr := repo.Tags() + if repoTagsErr != nil { + return "", repoTagsErr + } + repoTags := make(map[plumbing.Hash]*plumbing.Reference) + tagIterErr := tagIterator.ForEach(func(tag *plumbing.Reference) error { + if tagObject, tagObjectErr := repo.TagObject(tag.Hash()); tagObjectErr == nil { + // Only include tags that have a valid SemVer version format. + if _, semVerParseErr := semver.NewVersion(tag.Name().Short()); semVerParseErr == nil { + repoTags[tagObject.Target] = tag + } + } else { + repoTags[tag.Hash()] = tag + } + return nil + }) + tagIterator.Close() + if tagIterErr != nil { + return "", tagIterErr + } + + type describeCandidate struct { + ref *plumbing.Reference + annotated bool + distance int + } + var tagCandidates []*describeCandidate + var tagCandidatesFound int + var tagCount = -1 + var lastCommit *object.Commit + + // Search for maximal 10 (Git default) suitable tag candidates in all commits of the current branch. + for { + var candidate = &describeCandidate{annotated: false} + tagCommitIterErr := commitIterator.ForEach(func(commit *object.Commit) error { + lastCommit = commit + tagCount++ + if tagReference, ok := repoTags[commit.Hash]; ok { + delete(repoTags, commit.Hash) + candidate.ref = tagReference + hash := tagReference.Hash() + if !bytes.Equal(commit.Hash[:], hash[:]) { + candidate.annotated = true + } + return storer.ErrStop + } + return nil + }) + if tagCommitIterErr != nil { + return "", tagCommitIterErr + } + + if candidate.annotated { + if tagCandidatesFound < 10 { + candidate.distance = tagCount + tagCandidates = append(tagCandidates, candidate) + } + tagCandidatesFound++ + } + + if tagCandidatesFound > 10 || len(tags) == 0 { + break + } + } + + // Use the version from the application configuration by default or... + version, semVerErr := semver.NewVersion(config.Version) + if semVerErr != nil { + return "", fmt.Errorf("failed to parse default version from application configuration: %s", semVerErr) + } + if len(tagCandidates) == 0 { + prt.Infof("No Git tag found, using defined version %s as fallback", color.CyanString(config.Version)) + // ...the latest Git tag from the current branch if at least one has been found. + } else { + version, semVerErr = semver.NewVersion(tagCandidates[0].ref.Name().Short()) + if semVerErr != nil { + return "", fmt.Errorf("failed to parse version from Git tag %s: %s", + tagCandidates[0].ref.Name().Short(), semVerErr) + } + } + // Add additional version information if the latest commit of the current branch is not the found tag. + if len(tagCandidates) != 0 && tagCandidates[0].distance > 0 { + // If not included in the tag already, append metadata consisting of the amount of commit(s) ahead and the shortened + // commit hash (8 digits) of the latest commit. + buildMetaData := fmt.Sprintf("%s.%s", strconv.Itoa(tagCandidates[0].distance), currentBranchRef.Hash().String()[:8]) + if version.Metadata() != "" { + metadataVersion, err := version.SetMetadata(fmt.Sprintf("%s-%s", version.Metadata(), buildMetaData)) + if err != nil { + return "", err + } + version = &metadataVersion + } else { + metadataVersion, err := version.SetMetadata(buildMetaData) + if err != nil { + return "", err + } + version = &metadataVersion + } + prt.Infof("Using latest Git commit %s, %s commit(s) ahead of %s", + color.CyanString(currentBranchRef.Hash().String()[:8]), + color.CyanString(strconv.Itoa(tagCandidates[0].distance)), + color.CyanString("%s", tagCandidates[0].ref.Name().Short())) + } else { + prt.Infof("Using Git tag %s as application version", color.CyanString(version.Original())) + } + + return version.String(), nil +} + // getEnvFlags returns environment variables storing metadata the build time, Git version tags and commit checksum. func getEnvFlags() map[string]string { buildDate := time.Now().Format(time.RFC3339) @@ -377,32 +541,17 @@ func getEnvFlags() map[string]string { os.Exit(1) } - var version []string - // Find the latest Git tag in all branches, otherwise use the defined version. - latestGitTag, _ := sh.Output("git", "rev-list", "--tags", "--max-count=1") - if tag, gitTagErr := sh.Output("git", "describe", "--tags", latestGitTag); gitTagErr != nil { - version = append(version, "develop") - prt.Infof("No Git tag found, using %s as fallback version", color.CyanString("develop")) - } else { - version = append(version, tag) - prt.Infof("Using Git tag %s as version", color.CyanString(tag)) - } - - // If the current branch is ahead of the `master` branch append the commit count and hash of the latest commit. - commitsAhead, _ := sh.Output("git", "rev-list", "--count", "master..HEAD") - commitCount, err := strconv.Atoi(commitsAhead) - if err == nil && commitCount > 0 { - commitHash, _ := sh.Output("git", "rev-parse", "--short=8", "HEAD") - version = append(version, commitsAhead, commitHash) - prt.Infof("Building with latest Git commit %s, %s commits ahead of %s branch", - color.CyanString(commitHash), color.CyanString(commitsAhead), color.CyanString("master")) + version, versionErr := getAppVersionFromGit() + if versionErr != nil { + prt.Errorf("Failed to assemble application version: %s", versionErr) + os.Exit(1) } prt.Infof( "Injecting %s:\n"+ " Build Date: %s\n"+ " Version: %s", - color.BlueString("LDFLAGS"), color.CyanString(buildDate), color.CyanString(strings.Join(version, "-"))) + color.BlueString("LDFLAGS"), color.CyanString(buildDate), color.CyanString(version)) prt.Infof( "Injecting %s:\n"+ @@ -418,7 +567,7 @@ func getEnvFlags() map[string]string { "BUILD_DATE_TIME": buildDate, "PACKAGE_NAME": config.PackageName, "PROJECT_ROOT": pwd, - "VERSION": strings.Join(version, "-")} + "VERSION": version} } // getExecutablePath returns the path to the executable for the given package/module.