From 7b550f7832ad426937b006c67bccbf5789ff50a0 Mon Sep 17 00:00:00 2001 From: Szilard Parrag Date: Tue, 13 Feb 2024 14:26:56 +0100 Subject: [PATCH] fix(goreleaser): generate-goreleaser target works Signed-off-by: Szilard Parrag --- .goreleaser.yaml | 1 - cmd/goreleaser/internal/configure.go | 22 +++++++--------------- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 052974c4..0cae7ec0 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -6,7 +6,6 @@ builds: goarch: - amd64 - arm64 - dir: distributions/otelcol-contrib/_build binary: otelcol-contrib ldflags: diff --git a/cmd/goreleaser/internal/configure.go b/cmd/goreleaser/internal/configure.go index aa6792bb..73ab64e7 100644 --- a/cmd/goreleaser/internal/configure.go +++ b/cmd/goreleaser/internal/configure.go @@ -31,9 +31,9 @@ import ( const ArmArch = "arm" var ( - ImagePrefixes = []string{"otel", "ghcr.io/open-telemetry/opentelemetry-collector-releases"} - Architectures = []string{"386", "amd64", "arm", "arm64", "ppc64le", "s390x"} - ArmVersions = []string{"7"} + ImagePrefixes = []string{"ghcr.io/axoflow/opentelemetry-collector-releases"} + Architectures = []string{"amd64", "arm64"} + ArmVersions = []string{} ) func Generate(imagePrefixes []string, dists []string) config.Project { @@ -43,9 +43,9 @@ func Generate(imagePrefixes []string, dists []string) config.Project { NameTemplate: "{{ .ProjectName }}_checksums.txt", }, - Builds: Builds(dists), - Archives: Archives(dists), - NFPMs: Packages(dists), + Builds: Builds(dists), + Archives: Archives(dists), + //NFPMs: Packages(dists), Dockers: DockerImages(imagePrefixes, dists), DockerManifests: DockerManifests(imagePrefixes, dists), } @@ -70,17 +70,9 @@ func Build(dist string) config.Build { Flags: []string{"-trimpath"}, Ldflags: []string{"-s", "-w"}, }, - Goos: []string{"darwin", "linux", "windows"}, + Goos: []string{"linux"}, Goarch: Architectures, Goarm: ArmVersions, - Ignore: []config.IgnoredBuild{ - {Goos: "darwin", Goarch: "386"}, - {Goos: "darwin", Goarch: "arm"}, - {Goos: "darwin", Goarch: "s390x"}, - {Goos: "windows", Goarch: "arm"}, - {Goos: "windows", Goarch: "arm64"}, - {Goos: "windows", Goarch: "s390x"}, - }, } }