Merge branch 'dev' into main

jfrog · Nov 25, 2021 · bc2c331 · bc2c331
2 parents 4f856f7 + e83cd19
commit bc2c331
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git 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
diff --git 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 {

diff --git 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/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.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
@@ -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.4 h1:+yrZ6e3HZXJf6knORZxfbF/LCsK7FTdzmxHPbAaJtQk=
 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.1 h1:uu1kr1pOHb0NmT+Equm+FwOOoksWCeSqBOdhmd+60HY=
-github.com/jfrog/jfrog-client-go v1.6.1/go.mod h1:oR5emUgDSN+T8jNXqimKy9VxszQQuWumv1bst8od3vU=
+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=
@@ -137,9 +138,8 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 h1:SrN+KX8Art/Sf4HNj6Zcz06G7
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=