Skip to content

Commit

Permalink
fix(goreleaser): generate-goreleaser target works
Browse files Browse the repository at this point in the history
Signed-off-by: Szilard Parrag <[email protected]>
  • Loading branch information
OverOrion committed Feb 13, 2024
1 parent dbb848b commit 7b550f7
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 16 deletions.
1 change: 0 additions & 1 deletion .goreleaser.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ builds:
goarch:
- amd64
- arm64

dir: distributions/otelcol-contrib/_build
binary: otelcol-contrib
ldflags:
Expand Down
22 changes: 7 additions & 15 deletions cmd/goreleaser/internal/configure.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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),
}
Expand All @@ -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"},
},
}
}

Expand Down

0 comments on commit 7b550f7

Please sign in to comment.