diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 9066c50129..094317aca2 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -67,7 +67,7 @@ builds: - -X {{.Env.PKG}}.Commit={{.FullCommit}} - -X {{.Env.PKG}}.Date={{.Date}} - -X {{.Env.PKG}}.Version={{.Summary}} - # goos: [ 'darwin', 'linux', 'windows' ] - default + goos: [ 'darwin', 'linux', 'windows' ] goarch: - amd64 - arm64 @@ -84,6 +84,7 @@ builds: - -X {{.Env.PKG}}.Commit={{.FullCommit}} - -X {{.Env.PKG}}.Date={{.Date}} - -X {{.Env.PKG}}.Version={{.Summary}} + goos: [ 'darwin', 'linux', 'windows' ] goarch: - amd64 - arm64 @@ -100,6 +101,7 @@ builds: - -X {{.Env.PKG}}.Commit={{.FullCommit}} - -X {{.Env.PKG}}.Date={{.Date}} - -X {{.Env.PKG}}.Version={{.Summary}} + goos: [ 'darwin', 'linux', 'windows' ] goarch: - amd64 - arm64 @@ -116,6 +118,7 @@ builds: - -X {{.Env.PKG}}.Commit={{.FullCommit}} - -X {{.Env.PKG}}.Date={{.Date}} - -X {{.Env.PKG}}.Version={{.Summary}} + goos: [ 'darwin', 'linux', 'windows' ] goarch: - amd64 - arm64 @@ -132,6 +135,7 @@ builds: - -X {{.Env.PKG}}.Commit={{.FullCommit}} - -X {{.Env.PKG}}.Date={{.Date}} - -X {{.Env.PKG}}.Version={{.Summary}} + goos: [ 'darwin', 'linux', 'windows' ] goarch: - amd64 - arm64 @@ -148,6 +152,7 @@ builds: - -X {{.Env.PKG}}.Commit={{.FullCommit}} - -X {{.Env.PKG}}.Date={{.Date}} - -X {{.Env.PKG}}.Version={{.Summary}} + goos: [ 'darwin', 'linux', 'windows' ] goarch: - amd64 - arm64 diff --git a/pkg/assembler/backends/keyvalue/hasSBOM_test.go b/pkg/assembler/backends/keyvalue/hasSBOM_test.go index 71195e5363..d2373b517a 100644 --- a/pkg/assembler/backends/keyvalue/hasSBOM_test.go +++ b/pkg/assembler/backends/keyvalue/hasSBOM_test.go @@ -293,22 +293,6 @@ var includedTestExpectedSBOM = &model.HasSbom{ // End of Test resources -func getPackageVersionFromIngestedPackage(pkg *model.Package) (string, error) { - if pkg != nil { - if len(pkg.Namespaces) == 1 { - namespace := pkg.Namespaces[0] - if len(namespace.Names) == 1 { - name := namespace.Names[0] - if len(name.Versions) == 1 { - version := name.Versions[0] - return version.ID, nil - } - } - } - } - return "", fmt.Errorf("could not retrieve ingested PackageVersion from package id %v", pkg) -} - func getNodeIds(nodes []model.Node) ([]string, error) { var ids []string for _, node := range nodes {