another try

Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com>
open-telemetry · Dec 11, 2024 · 9380631 · 9380631
1 parent bdd7a46
commit 9380631
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/cmd/goreleaser/internal/configure.go b/cmd/goreleaser/internal/configure.go
@@ -118,9 +118,14 @@ func Build(dist string, buildOrRest bool, pie bool) config.Build {
 	archs := Architectures
 	id := dist
 	ldflags := []string{"-s", "-w"}
+	var prebuiltPath string
+
 	if pie {
 		ldflags = append(ldflags, "-buildmode=pie")
 		id = id + "-pie"
+		prebuiltPath = fmt.Sprintf("artifacts/otelcol-contrib_{{ .Target }}%s/otelcol-contrib{{- if eq .Os \"windows\" }}.exe{{ end }}", "-pie")
+	} else {
+		prebuiltPath = "artifacts/otelcol-contrib_{{ .Target }}/otelcol-contrib{{- if eq .Os \"windows\" }}.exe{{ end }}"
 	}
 
 	if dist == ContribDistro && !buildOrRest {
@@ -129,16 +134,14 @@ func Build(dist string, buildOrRest bool, pie bool) config.Build {
 			ID:      id,
 			Builder: "prebuilt",
 			PreBuilt: config.PreBuiltOptions{
-				Path: "artifacts/otelcol-contrib_{{ .Target }}" +
-					"/otelcol-contrib{{- if eq .Os \"windows\" }}.exe{{ end }}",
+				Path: prebuiltPath,
 			},
-			Goos:            goos,
-			Goarch:          archs,
-			Goarm:           ArmVersions(dist),
-			Dir:             "_build",
-			Binary:          dist,
-			Ignore:          generateIgnored(goos, archs, pie),
-			NoUniqueDistDir: "true",
+			Goos:   goos,
+			Goarch: archs,
+			Goarm:  ArmVersions(dist),
+			Dir:    "_build",
+			Binary: dist,
+			Ignore: generateIgnored(goos, archs, pie),
 		}
 	}
 

diff --git a/distributions/otelcol-contrib/.goreleaser.yaml b/distributions/otelcol-contrib/.goreleaser.yaml
@@ -52,9 +52,8 @@ builds:
     dir: _build
     binary: otelcol-contrib
     builder: prebuilt
-    no_unique_dist_dir: "true"
     prebuilt:
-      path: artifacts/otelcol-contrib_{{ .Target }}/otelcol-contrib{{- if eq .Os "windows" }}.exe{{ end }}
+      path: artifacts/otelcol-contrib_{{ .Target }}-pie/otelcol-contrib{{- if eq .Os "windows" }}.exe{{ end }}
   - id: otelcol-contrib
     goos:
       - darwin
@@ -99,7 +98,6 @@ builds:
     dir: _build
     binary: otelcol-contrib
     builder: prebuilt
-    no_unique_dist_dir: "true"
     prebuilt:
       path: artifacts/otelcol-contrib_{{ .Target }}/otelcol-contrib{{- if eq .Os "windows" }}.exe{{ end }}
 archives: