@@ -42,32 +42,22 @@ const (
4242var (
4343 ImagePrefixes = []string {DockerHub , GHCR }
4444 Architectures = []string {"386" , "amd64" , "arm" , "arm64" , "ppc64le" , "s390x" }
45+ ArmVersions = []string {"7" }
4546 DefaultConfigDists = map [string ]bool {CoreDistro : true , ContribDistro : true }
4647 MSIWindowsDists = map [string ]bool {CoreDistro : true , ContribDistro : true , OTLPDistro : true }
4748 K8sDockerSkipArchs = map [string ]bool {"arm" : true , "386" : true }
4849 K8sGoos = []string {"linux" }
4950 K8sArchs = []string {"amd64" , "arm64" , "ppc64le" , "s390x" }
5051)
5152
52- func GenerateContribBuildOnly (dist string , buildOrRest bool ) config.Project {
53- return config.Project {
54- ProjectName : "opentelemetry-collector-releases" ,
55- Builds : Builds (dist , buildOrRest ),
56- Version : 2 ,
57- Monorepo : config.Monorepo {
58- TagPrefix : "v" ,
59- },
60- }
61- }
62-
63- func Generate (dist string , buildOrRest bool ) config.Project {
53+ func Generate (dist string ) config.Project {
6454 return config.Project {
6555 ProjectName : "opentelemetry-collector-releases" ,
6656 Checksum : config.Checksum {
6757 NameTemplate : fmt .Sprintf ("{{ .ProjectName }}_%v_checksums.txt" , dist ),
6858 },
6959 Env : []string {"COSIGN_YES=true" },
70- Builds : Builds (dist , buildOrRest ),
60+ Builds : Builds (dist ),
7161 Archives : Archives (dist ),
7262 MSI : WinPackages (dist ),
7363 NFPMs : Packages (dist ),
@@ -83,41 +73,37 @@ func Generate(dist string, buildOrRest bool) config.Project {
8373 }
8474}
8575
86- func Builds (dist string , buildOrRest bool ) []config.Build {
76+ func Builds (dist string ) []config.Build {
8777 return []config.Build {
88- Build (dist , buildOrRest ),
78+ Build (dist ),
8979 }
9080}
9181
9282// Build configures a goreleaser build.
9383// https://goreleaser.com/customization/build/
94- func Build (dist string , buildOrRest bool ) config.Build {
95- goos := []string {"darwin" , "linux" , "windows" }
96- archs := Architectures
97-
98- if dist == ContribDistro && ! buildOrRest {
99- // only return build config for contrib build file
100- return config.Build {
101- ID : dist ,
102- Builder : "prebuilt" ,
103- PreBuilt : config.PreBuiltOptions {
104- Path : "artifacts/otelcol-contrib_{{ .Target }}" +
105- "/otelcol-contrib{{- if eq .Os \" windows\" }}.exe{{ end }}" ,
106- },
107- Goos : goos ,
108- Goarch : archs ,
109- Goarm : ArmVersions (dist ),
110- Dir : "_build" ,
111- Binary : dist ,
112- Ignore : IgnoreBuildCombinations (dist ),
113- }
114- }
115-
84+ func Build (dist string ) config.Build {
85+ var goos []string
86+ var archs []string
87+ var ignore []config.IgnoredBuild
88+ var armVersions []string
11689 if dist == K8sDistro {
11790 goos = K8sGoos
11891 archs = K8sArchs
92+ ignore = make ([]config.IgnoredBuild , 0 )
93+ armVersions = make ([]string , 0 )
94+ } else {
95+ goos = []string {"darwin" , "linux" , "windows" }
96+ archs = Architectures
97+ ignore = []config.IgnoredBuild {
98+ {Goos : "darwin" , Goarch : "386" },
99+ {Goos : "darwin" , Goarch : "arm" },
100+ {Goos : "darwin" , Goarch : "s390x" },
101+ {Goos : "windows" , Goarch : "arm" },
102+ {Goos : "windows" , Goarch : "arm64" },
103+ {Goos : "windows" , Goarch : "s390x" },
104+ }
105+ armVersions = ArmVersions
119106 }
120-
121107 return config.Build {
122108 ID : dist ,
123109 Dir : "_build" ,
@@ -129,33 +115,12 @@ func Build(dist string, buildOrRest bool) config.Build {
129115 },
130116 Goos : goos ,
131117 Goarch : archs ,
132- Goarm : ArmVersions ( dist ) ,
133- Ignore : IgnoreBuildCombinations ( dist ) ,
118+ Goarm : armVersions ,
119+ Ignore : ignore ,
134120 }
135121}
136122
137- func IgnoreBuildCombinations (dist string ) []config.IgnoredBuild {
138- if dist == K8sDistro {
139- return nil
140- }
141- return []config.IgnoredBuild {
142- {Goos : "darwin" , Goarch : "386" },
143- {Goos : "darwin" , Goarch : "arm" },
144- {Goos : "darwin" , Goarch : "s390x" },
145- {Goos : "windows" , Goarch : "arm" },
146- {Goos : "windows" , Goarch : "arm64" },
147- {Goos : "windows" , Goarch : "s390x" },
148- }
149- }
150-
151- func ArmVersions (dist string ) []string {
152- if dist == K8sDistro {
153- return nil
154- }
155- return []string {"7" }
156- }
157-
158- func Archives (dist string ) []config.Archive {
123+ func Archives (dist string ) (r []config.Archive ) {
159124 return []config.Archive {
160125 Archive (dist ),
161126 }
@@ -173,7 +138,7 @@ func Archive(dist string) config.Archive {
173138
174139func WinPackages (dist string ) []config.MSI {
175140 if _ , ok := MSIWindowsDists [dist ]; ! ok {
176- return nil
141+ return []config. MSI {}
177142 }
178143 return []config.MSI {
179144 WinPackage (dist ),
@@ -195,9 +160,9 @@ func WinPackage(dist string) config.MSI {
195160 }
196161}
197162
198- func Packages (dist string ) []config.NFPM {
163+ func Packages (dist string ) ( r []config.NFPM ) {
199164 if dist == K8sDistro {
200- return nil
165+ return []config. NFPM {}
201166 }
202167 return []config.NFPM {
203168 Package (dist ),
@@ -226,17 +191,21 @@ func Package(dist string) config.NFPM {
226191 })
227192 }
228193 return config.NFPM {
229- ID : dist ,
230- Builds : []string {dist },
231- Formats : []string {"deb" , "rpm" },
194+ ID : dist ,
195+ Builds : []string {dist },
196+ Formats : []string {"deb" , "rpm" },
197+
232198 License : "Apache 2.0" ,
233199 Description : fmt .Sprintf ("OpenTelemetry Collector - %s" , dist ),
234200 Maintainer :
"The OpenTelemetry Collector maintainers <[email protected] >" ,
235201 Overrides : map [string ]config.NFPMOverridables {
236202 "rpm" : {
237- Dependencies : []string {"/bin/sh" },
203+ Dependencies : []string {
204+ "/bin/sh" ,
205+ },
238206 },
239207 },
208+
240209 NFPMOverridables : config.NFPMOverridables {
241210 PackageName : dist ,
242211 Scripts : config.NFPMScripts {
@@ -250,14 +219,16 @@ func Package(dist string) config.NFPM {
250219}
251220
252221func DockerImages (dist string ) []config.Docker {
253- var r []config.Docker
222+ r := make ( []config.Docker , 0 )
254223 for _ , arch := range Architectures {
255- if dist == K8sDistro && K8sDockerSkipArchs [arch ] {
256- continue
224+ if dist == K8sDistro {
225+ if _ , ok := K8sDockerSkipArchs [arch ]; ok {
226+ continue
227+ }
257228 }
258229 switch arch {
259230 case ArmArch :
260- for _ , vers := range ArmVersions ( dist ) {
231+ for _ , vers := range ArmVersions {
261232 r = append (r , DockerImage (dist , arch , vers ))
262233 }
263234 default :
@@ -331,7 +302,7 @@ func DockerManifest(prefix, version, dist string) config.DockerManifest {
331302 }
332303 switch arch {
333304 case ArmArch :
334- for _ , armVers := range ArmVersions ( dist ) {
305+ for _ , armVers := range ArmVersions {
335306 dockerArchTag := strings .ReplaceAll (archName (arch , armVers ), "/" , "" )
336307 imageTemplates = append (
337308 imageTemplates ,
0 commit comments