[chore] Fix Makefile (#517)

open-telemetry · Apr 5, 2024 · 8444beb · 8444beb
1 parent 11d21b5
commit 8444beb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -25,7 +25,7 @@ goreleaser-verify: goreleaser
 	@${GORELEASER} release --snapshot --clean
 
 ensure-goreleaser-up-to-date: generate-goreleaser
-	@git diff -s --exit-code distributions/*/.goreleaser.yaml || (echo "Build failed: The goreleaser templates have changed but the .goreleaser.yamls haven't. Run 'make generate-goreleaser' and update your PR." && exit 0)
+	@git diff -s --exit-code distributions/*/.goreleaser.yaml || (echo "Check failed: The goreleaser templates have changed but the .goreleaser.yamls haven't. Run 'make generate-goreleaser' and update your PR." && exit 1)
 
 .PHONY: ocb
 ocb:

diff --git a/cmd/goreleaser/internal/configure.go b/cmd/goreleaser/internal/configure.go
@@ -140,7 +140,7 @@ func Package(dist string) config.NFPM {
 				{
 					Source:      "config.yaml",
 					Destination: path.Join("/etc", dist, "config.yaml"),
-					Type:        "config",
+					Type:        "config|noreplace",
 				},
 			},
 		},