make generate-goreleaser

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

Hide file tree

Showing 3 changed files with 65 additions and 19 deletions.
diff --git a/distributions/otelcol-contrib/.goreleaser-build.yaml b/distributions/otelcol-contrib/.goreleaser-build.yaml
@@ -3,6 +3,53 @@ partial:
 version: 2
 project_name: opentelemetry-collector-releases
 builds:
+  - id: otelcol-contrib-pie
+    goos:
+      - darwin
+      - linux
+      - windows
+    goarch:
+      - "386"
+      - amd64
+      - arm
+      - arm64
+      - ppc64le
+      - s390x
+    goarm:
+      - "7"
+    ignore:
+      - goos: darwin
+        goarch: "386"
+      - goos: darwin
+        goarch: arm
+      - goos: darwin
+        goarch: ppc64le
+      - goos: darwin
+        goarch: s390x
+      - goos: linux
+        goarch: "386"
+      - goos: linux
+        goarch: arm
+      - goos: linux
+        goarch: s390x
+      - goos: windows
+        goarch: arm
+      - goos: windows
+        goarch: arm64
+      - goos: windows
+        goarch: ppc64le
+      - goos: windows
+        goarch: s390x
+    dir: _build
+    binary: otelcol-contrib
+    ldflags:
+      - -s
+      - -w
+      - -buildmode=pie
+    flags:
+      - -trimpath
+    env:
+      - CGO_ENABLED=0
   - id: otelcol-contrib
     goos:
       - darwin
@@ -20,10 +67,24 @@ builds:
     ignore:
       - goos: darwin
         goarch: "386"
+      - goos: darwin
+        goarch: amd64
       - goos: darwin
         goarch: arm
+      - goos: darwin
+        goarch: arm64
       - goos: darwin
         goarch: s390x
+      - goos: linux
+        goarch: amd64
+      - goos: linux
+        goarch: arm64
+      - goos: linux
+        goarch: ppc64le
+      - goos: windows
+        goarch: "386"
+      - goos: windows
+        goarch: amd64
       - goos: windows
         goarch: arm
       - goos: windows

diff --git a/distributions/otelcol-contrib/.goreleaser.yaml b/distributions/otelcol-contrib/.goreleaser.yaml
@@ -12,7 +12,7 @@ msi:
       - opentelemetry.ico
       - config.yaml
 builds:
-  - id: otelcol-contrib-pie
+  - id: otelcol-contrib
     goos:
       - darwin
       - linux
@@ -51,14 +51,9 @@ builds:
         goarch: s390x
     dir: _build
     binary: otelcol-contrib
-    ldflags:
-      - -s
-      - -w
-      - -buildmode=pie
-    flags:
-      - -trimpath
-    env:
-      - CGO_ENABLED=0
+    builder: prebuilt
+    prebuilt:
+      path: artifacts/otelcol-contrib_{{ .Target }}/otelcol-contrib{{- if eq .Os "windows" }}.exe{{ end }}
   - id: otelcol-contrib
     goos:
       - darwin

diff --git a/distributions/otelcol-k8s/.goreleaser.yaml b/distributions/otelcol-k8s/.goreleaser.yaml
@@ -13,9 +13,6 @@ builds:
       - arm64
       - ppc64le
       - s390x
-    ignore:
-      - goos: linux
-        goarch: s390x
     dir: _build
     binary: otelcol-k8s
     ldflags:
@@ -34,13 +31,6 @@ builds:
       - arm64
       - ppc64le
       - s390x
-    ignore:
-      - goos: linux
-        goarch: amd64
-      - goos: linux
-        goarch: arm64
-      - goos: linux
-        goarch: ppc64le
     dir: _build
     binary: otelcol-k8s
     ldflags: