minor refactoring

Signed-off-by: Moritz Wiesinger <[email protected]>

cmd/goreleaser/internal/configure.go

@@ -92,29 +92,31 @@ func Builds(dist string, buildOrRest bool) []config.Build {
 // Build configures a goreleaser build.
 // https://goreleaser.com/customization/build/
 func Build(dist string, buildOrRest bool) config.Build {
-	if !buildOrRest && dist == ContribDistro {
+	goos := []string{"darwin", "linux", "windows"}
+	archs := Architectures
+
+	if dist == ContribDistro && !buildOrRest {
 		// only return build config for contrib build file
 		return config.Build{
 			ID:      dist,
 			Builder: "prebuilt",
 			PreBuilt: config.PreBuiltOptions{
 				Path: "artifacts/otelcol-contrib_{{ .Os }}_{{ .Arch }}{{ with .Amd64 }}_{{ . }}{{ end }}{{ with .Arm }}_{{ . }}{{ end }}{{ with .Mips }}_{{ . }}{{ end }}/otelcol-contrib{{- if eq .Os \"windows\" }}.exe{{ end }}",
 			},
-			Goos:   []string{"darwin", "linux", "windows"},
-			Goarch: Architectures,
+			Goos:   goos,
+			Goarch: archs,
 			Goarm:  ArmVersions(dist),
 			Dir:    "_build",
 			Binary: dist,
 			Ignore: IgnoreBuildCombinations(dist),
 		}
 	}
 
-	goos := []string{"darwin", "linux", "windows"}
-	archs := Architectures
 	if dist == K8sDistro {
 		goos = K8sGoos
 		archs = K8sArchs
 	}
+
 	return config.Build{
 		ID:     dist,
 		Dir:    "_build",

cmd/goreleaser/main.go

@@ -26,7 +26,7 @@ import (
 )
 
 var distFlag = flag.String("d", "", "Collector distributions to build")
-var contribBuildOrRestFlag = flag.Bool("b", false, "Collector Contrib distribution only - switch between build and package config file - set to true to generate build step, false to generate pacakge step")
+var contribBuildOrRestFlag = flag.Bool("b", false, "Collector Contrib distribution only - switch between build and package config file - set to true to generate build step, false to generate package step")
 
 func main() {
 	flag.Parse()