@@ -42,22 +42,32 @@ const (
4242var (
4343 ImagePrefixes = []string {DockerHub , GHCR }
4444 Architectures = []string {"386" , "amd64" , "arm" , "arm64" , "ppc64le" , "s390x" }
45- ArmVersions = []string {"7" }
4645 DefaultConfigDists = map [string ]bool {CoreDistro : true , ContribDistro : true }
4746 MSIWindowsDists = map [string ]bool {CoreDistro : true , ContribDistro : true , OTLPDistro : true }
4847 K8sDockerSkipArchs = map [string ]bool {"arm" : true , "386" : true }
4948 K8sGoos = []string {"linux" }
5049 K8sArchs = []string {"amd64" , "arm64" , "ppc64le" , "s390x" }
5150)
5251
53- func Generate (dist string ) config.Project {
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 {
5464 return config.Project {
5565 ProjectName : "opentelemetry-collector-releases" ,
5666 Checksum : config.Checksum {
5767 NameTemplate : fmt .Sprintf ("{{ .ProjectName }}_%v_checksums.txt" , dist ),
5868 },
5969 Env : []string {"COSIGN_YES=true" },
60- Builds : Builds (dist ),
70+ Builds : Builds (dist , buildOrRest ),
6171 Archives : Archives (dist ),
6272 MSI : WinPackages (dist ),
6373 NFPMs : Packages (dist ),
@@ -73,37 +83,41 @@ func Generate(dist string) config.Project {
7383 }
7484}
7585
76- func Builds (dist string ) []config.Build {
86+ func Builds (dist string , buildOrRest bool ) []config.Build {
7787 return []config.Build {
78- Build (dist ),
88+ Build (dist , buildOrRest ),
7989 }
8090}
8191
8292// Build configures a goreleaser build.
8393// https://goreleaser.com/customization/build/
84- func Build (dist string ) config.Build {
85- var goos []string
86- var archs []string
87- var ignore []config.IgnoredBuild
88- var armVersions []string
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+
89116 if dist == K8sDistro {
90117 goos = K8sGoos
91118 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
106119 }
120+
107121 return config.Build {
108122 ID : dist ,
109123 Dir : "_build" ,
@@ -115,12 +129,33 @@ func Build(dist string) config.Build {
115129 },
116130 Goos : goos ,
117131 Goarch : archs ,
118- Goarm : armVersions ,
119- Ignore : ignore ,
132+ Goarm : ArmVersions ( dist ) ,
133+ Ignore : IgnoreBuildCombinations ( dist ) ,
120134 }
121135}
122136
123- func Archives (dist string ) (r []config.Archive ) {
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 {
124159 return []config.Archive {
125160 Archive (dist ),
126161 }
@@ -138,7 +173,7 @@ func Archive(dist string) config.Archive {
138173
139174func WinPackages (dist string ) []config.MSI {
140175 if _ , ok := MSIWindowsDists [dist ]; ! ok {
141- return []config. MSI {}
176+ return nil
142177 }
143178 return []config.MSI {
144179 WinPackage (dist ),
@@ -160,9 +195,9 @@ func WinPackage(dist string) config.MSI {
160195 }
161196}
162197
163- func Packages (dist string ) ( r []config.NFPM ) {
198+ func Packages (dist string ) []config.NFPM {
164199 if dist == K8sDistro {
165- return []config. NFPM {}
200+ return nil
166201 }
167202 return []config.NFPM {
168203 Package (dist ),
@@ -191,21 +226,17 @@ func Package(dist string) config.NFPM {
191226 })
192227 }
193228 return config.NFPM {
194- ID : dist ,
195- Builds : []string {dist },
196- Formats : []string {"deb" , "rpm" },
197-
229+ ID : dist ,
230+ Builds : []string {dist },
231+ Formats : []string {"deb" , "rpm" },
198232 License : "Apache 2.0" ,
199233 Description : fmt .Sprintf ("OpenTelemetry Collector - %s" , dist ),
200234 Maintainer :
"The OpenTelemetry Collector maintainers <[email protected] >" ,
201235 Overrides : map [string ]config.NFPMOverridables {
202236 "rpm" : {
203- Dependencies : []string {
204- "/bin/sh" ,
205- },
237+ Dependencies : []string {"/bin/sh" },
206238 },
207239 },
208-
209240 NFPMOverridables : config.NFPMOverridables {
210241 PackageName : dist ,
211242 Scripts : config.NFPMScripts {
@@ -219,16 +250,14 @@ func Package(dist string) config.NFPM {
219250}
220251
221252func DockerImages (dist string ) []config.Docker {
222- r := make ( []config.Docker , 0 )
253+ var r []config.Docker
223254 for _ , arch := range Architectures {
224- if dist == K8sDistro {
225- if _ , ok := K8sDockerSkipArchs [arch ]; ok {
226- continue
227- }
255+ if dist == K8sDistro && K8sDockerSkipArchs [arch ] {
256+ continue
228257 }
229258 switch arch {
230259 case ArmArch :
231- for _ , vers := range ArmVersions {
260+ for _ , vers := range ArmVersions ( dist ) {
232261 r = append (r , DockerImage (dist , arch , vers ))
233262 }
234263 default :
@@ -302,7 +331,7 @@ func DockerManifest(prefix, version, dist string) config.DockerManifest {
302331 }
303332 switch arch {
304333 case ArmArch :
305- for _ , armVers := range ArmVersions {
334+ for _ , armVers := range ArmVersions ( dist ) {
306335 dockerArchTag := strings .ReplaceAll (archName (arch , armVers ), "/" , "" )
307336 imageTemplates = append (
308337 imageTemplates ,
0 commit comments