From 24bafc7afb53196ee7c2cdf20a0bf65c1f531400 Mon Sep 17 00:00:00 2001 From: Yahav Itzhak Date: Wed, 24 Nov 2021 17:48:52 +0200 Subject: [PATCH 1/4] Skip empty generated build info (#16) --- build/build.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build/build.go b/build/build.go index 2874bd00..5ce42f81 100644 --- a/build/build.go +++ b/build/build.go @@ -153,6 +153,9 @@ func (b *Build) getGeneratedBuildsInfo() ([]*entities.BuildInfo, error) { if err != nil { return nil, err } + if len(content) == 0 { + continue + } buildInfo := new(entities.BuildInfo) err = json.Unmarshal(content, &buildInfo) if err != nil { From 28afdc82a46c1d1468bb4b9748703c7a9b0bc139 Mon Sep 17 00:00:00 2001 From: Robi Nino Date: Wed, 24 Nov 2021 18:23:42 +0200 Subject: [PATCH 2/4] Upgrade dependencies --- go.mod | 4 ++-- go.sum | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 42351a46..6d103754 100644 --- a/go.mod +++ b/go.mod @@ -10,8 +10,8 @@ require ( github.com/urfave/cli/v2 v2.3.0 ) -//replace github.com/jfrog/gocmd => github.com/asafgabai/gocmd v0.1.20-0.20211104074947-336390e289b0 +replace github.com/jfrog/gocmd => github.com/jfrog/gocmd v0.5.5-0.20211124162113-60531e4d9053 -//replace github.com/jfrog/jfrog-client-go => github.com/asafgabai/jfrog-client-go v0.18.1-0.20211108092514-4782801b57e9 +replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.6.2-0.20211124161105-96c723353021 //replace github.com/jfrog/gofrog => github.com/jfrog/gofrog v1.0.7-0.20211107071406-54da7fb08599 diff --git a/go.sum b/go.sum index f6b8d3b3..73e7541b 100644 --- a/go.sum +++ b/go.sum @@ -51,13 +51,13 @@ github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH 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.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4= -github.com/jfrog/build-info-go v0.1.0/go.mod h1:P89ESdsP7o2fqp8GGvHZjm+UgYKbkK6vk247VeCraKk= -github.com/jfrog/gocmd v0.5.3 h1:RkvDwnrso8jkEhiVipnUzFBpHRE8zwOM3eTwetb6sus= -github.com/jfrog/gocmd v0.5.3/go.mod h1:5q+DvcECGiJmLgut8KRYBzQaLNwl/W6kC/vwMffGm7g= +github.com/jfrog/build-info-go v0.1.1/go.mod h1:bht+ZAMpDIRXNeBW47eO2NN4MKt65xKQwBHMFnQgIeU= +github.com/jfrog/gocmd v0.5.5-0.20211124162113-60531e4d9053 h1:2tzNWzEpB9ZFYaR1VFOOkllPjofIBmYS7p/002K9UM4= +github.com/jfrog/gocmd v0.5.5-0.20211124162113-60531e4d9053/go.mod h1:VXyWB3SmAyppuN6QChKKT/DxRoPqCa9t6xMsU6lck5s= github.com/jfrog/gofrog v1.1.0 h1:nhbfSVUYWRxKHeU0RsPAUQeo1suc4oAcEttIKQRvWhs= github.com/jfrog/gofrog v1.1.0/go.mod h1:9YN5v4LlsCfLIXpwQnzSf1wVtgjdHM20FzuIu58RMI4= -github.com/jfrog/jfrog-client-go v1.6.0 h1:ayow0Z3t8leWQ3pb6lQRJx63/fUw+yhLpDzL2G3KfFk= -github.com/jfrog/jfrog-client-go v1.6.0/go.mod h1:efgBi75f56LWDw/ILsyoKnPYVbqu9na4pmuZeJ9V0vQ= +github.com/jfrog/jfrog-client-go v1.6.2-0.20211124161105-96c723353021 h1:3JZCmDWAkrsW26KoS3oup9p47jZmLtCKiFwdY0hdxB8= +github.com/jfrog/jfrog-client-go v1.6.2-0.20211124161105-96c723353021/go.mod h1:zlHWzfoXRFDETnGM3IY5LPFVOb35Gm7Iv306NOBRkJ4= github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 h1:DowS9hvgyYSX4TO5NpyC606/Z4SxnNYbT+WX27or6Ck= github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= From 280272539e094764be0e121a77c23c19e0912f0f Mon Sep 17 00:00:00 2001 From: eyalbe4 Date: Thu, 25 Nov 2021 09:38:28 +0200 Subject: [PATCH 3/4] Upgrade jfrog-client-go & gocmd --- go.mod | 6 +++--- go.sum | 9 +++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 6d103754..201e5078 100644 --- a/go.mod +++ b/go.mod @@ -3,15 +3,15 @@ module github.com/jfrog/build-info-go go 1.15 require ( - github.com/jfrog/gocmd v0.5.4 + github.com/jfrog/gocmd v0.5.5 github.com/jfrog/gofrog v1.1.0 github.com/jfrog/jfrog-client-go v1.6.1 github.com/stretchr/testify v1.7.0 github.com/urfave/cli/v2 v2.3.0 ) -replace github.com/jfrog/gocmd => github.com/jfrog/gocmd v0.5.5-0.20211124162113-60531e4d9053 +// replace github.com/jfrog/gocmd => github.com/jfrog/gocmd v0.5.5-0.20211124162113-60531e4d9053 -replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.6.2-0.20211124161105-96c723353021 +replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.6.2-0.20211124162552-294b033f185b //replace github.com/jfrog/gofrog => github.com/jfrog/gofrog v1.0.7-0.20211107071406-54da7fb08599 diff --git a/go.sum b/go.sum index 73e7541b..863445d8 100644 --- a/go.sum +++ b/go.sum @@ -52,12 +52,13 @@ github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOl github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4= github.com/jfrog/build-info-go v0.1.1/go.mod h1:bht+ZAMpDIRXNeBW47eO2NN4MKt65xKQwBHMFnQgIeU= -github.com/jfrog/gocmd v0.5.5-0.20211124162113-60531e4d9053 h1:2tzNWzEpB9ZFYaR1VFOOkllPjofIBmYS7p/002K9UM4= -github.com/jfrog/gocmd v0.5.5-0.20211124162113-60531e4d9053/go.mod h1:VXyWB3SmAyppuN6QChKKT/DxRoPqCa9t6xMsU6lck5s= +github.com/jfrog/gocmd v0.5.4/go.mod h1:nASNY/3Rv7M9VHjim+pIowo0I/fd38SJJm/Bxcp/Tww= +github.com/jfrog/gocmd v0.5.5 h1:LJc5PKpobbcx4O4Yb5NZUHf3cQAuWj4GEvsw4UgwMUI= +github.com/jfrog/gocmd v0.5.5/go.mod h1:4+ngOdyQlhP0i1/JuHqOC6hwjYWnCEp6ZJEExwyo9U4= github.com/jfrog/gofrog v1.1.0 h1:nhbfSVUYWRxKHeU0RsPAUQeo1suc4oAcEttIKQRvWhs= github.com/jfrog/gofrog v1.1.0/go.mod h1:9YN5v4LlsCfLIXpwQnzSf1wVtgjdHM20FzuIu58RMI4= -github.com/jfrog/jfrog-client-go v1.6.2-0.20211124161105-96c723353021 h1:3JZCmDWAkrsW26KoS3oup9p47jZmLtCKiFwdY0hdxB8= -github.com/jfrog/jfrog-client-go v1.6.2-0.20211124161105-96c723353021/go.mod h1:zlHWzfoXRFDETnGM3IY5LPFVOb35Gm7Iv306NOBRkJ4= +github.com/jfrog/jfrog-client-go v1.6.2-0.20211124162552-294b033f185b h1:H7ANqa+GssiPac1kFlt22EGw5F+EyS7mk98Xptsc6/0= +github.com/jfrog/jfrog-client-go v1.6.2-0.20211124162552-294b033f185b/go.mod h1:0Mj1EPH4/7mntcBWH3UhbhmESI+/rlQdXIheveh2Kes= github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 h1:DowS9hvgyYSX4TO5NpyC606/Z4SxnNYbT+WX27or6Ck= github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= From e83cd198418f25c99c94f9d99d3b665eb1281010 Mon Sep 17 00:00:00 2001 From: eyalbe4 Date: Thu, 25 Nov 2021 09:42:02 +0200 Subject: [PATCH 4/4] Update release notes --- RELEASE.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/RELEASE.md b/RELEASE.md index 96be0336..0f0c365e 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,7 +1,10 @@ # Release Notes +## 0.1.2 (November 25, 2021) +- Bug fix - Publishing build-info can fail, if a previous build-info collection action left an empty cache file + ## 0.1.1 (November 21, 2021) -- Hash build dir with sha256. +- Hash build dir with sha256 ## 0.1.0 (November 10, 2021) -- Initial release: support in generating build-info for Go, Maven and Gradle. +- Initial release: support in generating build-info for Go, Maven and Gradle