consolidate nfpms block

jackgopack4 · Nov 20, 2024 · 4a15286 · 4a15286
1 parent ea4806f
commit 4a15286
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 89 deletions.
diff --git a/cmd/goreleaser/internal/configure.go b/cmd/goreleaser/internal/configure.go
@@ -209,20 +209,14 @@ func Packages(dist string) (r []config.NFPM) {
 		return []config.NFPM{}
 	}
 	return []config.NFPM{
-		Package(dist, true),
-		Package(dist, false),
+		Package(dist),
 	}
 }
 
 // Package configures goreleaser to build a system package.
 // https://goreleaser.com/customization/nfpm/
-func Package(dist string, pie bool) config.NFPM {
-	id := dist
-	build := dist
-	if pie {
-		id = id + "-pie"
-		build = build + "-pie"
-	}
+func Package(dist string) config.NFPM {
+	buildPie := dist + "-pie"
 	nfpmContents := config.NFPMContents{
 		{
 			Source:      fmt.Sprintf("%s.service", dist),
@@ -242,8 +236,8 @@ func Package(dist string, pie bool) config.NFPM {
 		})
 	}
 	return config.NFPM{
-		ID:      id,
-		Builds:  []string{build},
+		ID:      dist,
+		Builds:  []string{dist, buildPie},
 		Formats: []string{"deb", "rpm"},
 
 		License:     "Apache 2.0",

diff --git a/distributions/otelcol-contrib/.goreleaser.yaml b/distributions/otelcol-contrib/.goreleaser.yaml
@@ -119,33 +119,6 @@ archives:
       - otelcol-contrib
     name_template: '{{ .Binary }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}{{ if .Mips }}_{{ .Mips }}{{ end }}'
 nfpms:
-  - package_name: otelcol-contrib
-    contents:
-      - src: otelcol-contrib.service
-        dst: /lib/systemd/system/otelcol-contrib.service
-      - src: otelcol-contrib.conf
-        dst: /etc/otelcol-contrib/otelcol-contrib.conf
-        type: config|noreplace
-      - src: config.yaml
-        dst: /etc/otelcol-contrib/config.yaml
-        type: config|noreplace
-    scripts:
-      preinstall: preinstall.sh
-      postinstall: postinstall.sh
-      preremove: preremove.sh
-    overrides:
-      rpm:
-        dependencies:
-          - /bin/sh
-    id: otelcol-contrib-pie
-    builds:
-      - otelcol-contrib-pie
-    formats:
-      - deb
-      - rpm
-    maintainer: The OpenTelemetry Collector maintainers <[email protected]>
-    description: OpenTelemetry Collector - otelcol-contrib
-    license: Apache 2.0
   - package_name: otelcol-contrib
     contents:
       - src: otelcol-contrib.service
@@ -167,6 +140,7 @@ nfpms:
     id: otelcol-contrib
     builds:
       - otelcol-contrib
+      - otelcol-contrib-pie
     formats:
       - deb
       - rpm

diff --git a/distributions/otelcol-otlp/.goreleaser.yaml b/distributions/otelcol-otlp/.goreleaser.yaml
@@ -118,30 +118,6 @@ archives:
       - otelcol-otlp
     name_template: '{{ .Binary }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}{{ if .Mips }}_{{ .Mips }}{{ end }}'
 nfpms:
-  - package_name: otelcol-otlp
-    contents:
-      - src: otelcol-otlp.service
-        dst: /lib/systemd/system/otelcol-otlp.service
-      - src: otelcol-otlp.conf
-        dst: /etc/otelcol-otlp/otelcol-otlp.conf
-        type: config|noreplace
-    scripts:
-      preinstall: preinstall.sh
-      postinstall: postinstall.sh
-      preremove: preremove.sh
-    overrides:
-      rpm:
-        dependencies:
-          - /bin/sh
-    id: otelcol-otlp-pie
-    builds:
-      - otelcol-otlp-pie
-    formats:
-      - deb
-      - rpm
-    maintainer: The OpenTelemetry Collector maintainers <[email protected]>
-    description: OpenTelemetry Collector - otelcol-otlp
-    license: Apache 2.0
   - package_name: otelcol-otlp
     contents:
       - src: otelcol-otlp.service
@@ -160,6 +136,7 @@ nfpms:
     id: otelcol-otlp
     builds:
       - otelcol-otlp
+      - otelcol-otlp-pie
     formats:
       - deb
       - rpm

diff --git a/distributions/otelcol/.goreleaser.yaml b/distributions/otelcol/.goreleaser.yaml
@@ -119,33 +119,6 @@ archives:
       - otelcol
     name_template: '{{ .Binary }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}{{ if .Mips }}_{{ .Mips }}{{ end }}'
 nfpms:
-  - package_name: otelcol
-    contents:
-      - src: otelcol.service
-        dst: /lib/systemd/system/otelcol.service
-      - src: otelcol.conf
-        dst: /etc/otelcol/otelcol.conf
-        type: config|noreplace
-      - src: config.yaml
-        dst: /etc/otelcol/config.yaml
-        type: config|noreplace
-    scripts:
-      preinstall: preinstall.sh
-      postinstall: postinstall.sh
-      preremove: preremove.sh
-    overrides:
-      rpm:
-        dependencies:
-          - /bin/sh
-    id: otelcol-pie
-    builds:
-      - otelcol-pie
-    formats:
-      - deb
-      - rpm
-    maintainer: The OpenTelemetry Collector maintainers <[email protected]>
-    description: OpenTelemetry Collector - otelcol
-    license: Apache 2.0
   - package_name: otelcol
     contents:
       - src: otelcol.service
@@ -167,6 +140,7 @@ nfpms:
     id: otelcol
     builds:
       - otelcol
+      - otelcol-pie
     formats:
       - deb
       - rpm