Merge pull request #5 from intel/2024.2/release-deployment

2024.2.0 release deployment

Author: denissemenov

build.sh

@@ -1,11 +1,9 @@
 #!/usr/bin/env bash
 export CGO_ENABLED=0
 
-export CGO_ENABLED=0
 version=$(git describe --long --dirty --abbrev=10 --tags)
 lf="-X github.com/intel/oneapi-cli/cmd.version=${version}"
 
-
-GOOS=linux GOARCH=amd64 go build -ldflags "$lf" -trimpath -mod=readonly -gcflags="all=-spectre=all -N -l" -asmflags="all=-spectre=all" -ldflags="all=-s -w" -o linux/bin/oneapi-cli
-GOOS=windows GOARCH=amd64 go build -ldflags "$lf" -trimpath -mod=readonly -gcflags="all=-spectre=all -N -l" -asmflags="all=-spectre=all" -ldflags="all=-s -w"  -o win/bin/oneapi-cli.exe
-GOOS=darwin GOARCH=amd64 go build -ldflags "$lf" -trimpath -mod=readonly -gcflags="all=-spectre=all -N -l" -asmflags="all=-spectre=all" -ldflags="all=-s -w" -o osx/bin/oneapi-cli
+GOOS=linux GOARCH=amd64 go build -trimpath -mod=readonly -gcflags="all=-spectre=all -N -l" -asmflags="all=-spectre=all" -ldflags="all=-s -w $lf" -o linux/bin/oneapi-cli
+GOOS=windows GOARCH=amd64 go build -trimpath -mod=readonly -gcflags="all=-spectre=all -N -l" -asmflags="all=-spectre=all" -ldflags="all=-s -w $lf"  -o win/bin/oneapi-cli.exe
+GOOS=darwin GOARCH=amd64 go build -trimpath -mod=readonly -gcflags="all=-spectre=all -N -l" -asmflags="all=-spectre=all" -ldflags="all=-s -w $lf" -o osx/bin/oneapi-cli

cmd/clean.go

@@ -18,7 +18,6 @@ var cleanCmd = &cobra.Command{
 	Short: "Clean Sample Cache",
 	Long:  `Removes local Sample Cache`,
 	Run: func(cmd *cobra.Command, args []string) {
-		os.RemoveAll(filepath.Join(baseFilePath, aggregator.AggregatorLocalAPILevel))
 		if err := os.RemoveAll(filepath.Join(baseFilePath, aggregator.AggregatorLocalAPILevel)); err != nil {
 			fmt.Println("Failed to clean sample cache.")
 			fmt.Printf("%s \n", err)

cmd/list.go

@@ -12,7 +12,12 @@ import (
 )
 
 func prettyPrint(i interface{}) string {
-	s, _ := json.MarshalIndent(i, "", "\t")
+	s, err := json.MarshalIndent(i, "", "\t")
+	if err != nil {
+		fmt.Println("Failed to pretty print Json")
+		fmt.Printf("%s \n", err)
+		os.Exit(1)
+	}
 	return string(s)
 }
 

go.mod

@@ -8,7 +8,7 @@ require (
 	github.com/spf13/cobra v1.6.1
 	gitlab.com/tslocum/cview v1.4.4
 	//	golang.org/x/sys v0.0.0-20221013171732-95e765b1cc43
-	golang.org/x/sys v0.13.0
+	golang.org/x/sys v0.18.0
 )
 
 require (
@@ -18,6 +18,6 @@ require (
 	github.com/mattn/go-runewidth v0.0.8 // indirect
 	github.com/rivo/uniseg v0.4.2 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	golang.org/x/net v0.17.0 // indirect
-	golang.org/x/text v0.13.0 // indirect
+	golang.org/x/net v0.23.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
 )

go.sum

@@ -29,18 +29,18 @@ gitlab.com/tslocum/cview v1.4.4 h1:sh1MUSN5zFd7vK+lHEq1jAxRD82TJb6uFW+EnECsEyc=
 gitlab.com/tslocum/cview v1.4.4/go.mod h1:+bEf1cg6IoWvL16YHJAKwGGpQf5s/nxXAA7YJr+WOHE=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/net v0.0.0-20191112182307-2180aed22343/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
-golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
+golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
+golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191112214154-59a1497f0cea/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
-golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
+golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
-golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

pkg/deps/checker.go

@@ -346,13 +346,19 @@ func readSomeJSON(path string, something interface{}) error {
 	if err != nil {
 		return err
 	}
-	json.Unmarshal(byteValue, something)
+	err = json.Unmarshal(byteValue, something)
+	if err != nil {
+		return err
+	}
 	return nil
 }
 
 // keeping the same interface as the file reading function for now.
 func parseSomeJSON(str string, something interface{}) error {
-	json.Unmarshal([]byte(str), something)
+	err := json.Unmarshal([]byte(str), something)
+	if err != nil {
+		return err
+	}
 	return nil
 }
 

pkg/extractor/tar.go

@@ -10,7 +10,7 @@ import (
 	"path/filepath"
 )
 
-//ExtractTarGz extracts a tar.gz to the destination
+// ExtractTarGz extracts a tar.gz to the destination
 func ExtractTarGz(sourcetb string, out string) error {
 
 	//Ensure Output exists
@@ -73,7 +73,10 @@ func ExtractTarGz(sourcetb string, out string) error {
 				return err
 			}
 
-			f.Close()
+			err = f.Close()
+			if err != nil {
+				return err
+			}
 		}
 	}
 }