remove debug things, update gorelease go config to resemble working config

Signed-off-by: Moritz Wiesinger <[email protected]>

Author: mowies

.github/workflows/base-ci-goreleaser.yaml

@@ -25,7 +25,6 @@ env:
 jobs:
   check-goreleaser:
     strategy:
-      fail-fast: false
       matrix:
         GOOS: ${{ fromJSON( inputs.goos) }}
         GOARCH: ${{ fromJSON( inputs.goarch) }}

.github/workflows/base-release.yaml

@@ -100,6 +100,9 @@ jobs:
         env:
           GOOS: ${{ matrix.GOOS }}
           GOARCH: ${{ matrix.GOARCH }}
+          GOARM: "7" # Default is 6
+          GOAMD64: v1
+          GOPPC64: power8
           GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
           GITHUB_TOKEN: ${{ secrets.GH_PAT }}
           COSIGN_YES: true

.github/workflows/ci-goreleaser-core.yaml

@@ -30,7 +30,7 @@ jobs:
     with:
       distribution: otelcol
       goos: '[ "linux", "windows", "darwin" ]'
-      goarch: '[ "386", "amd64", "arm64", "ppc64le", "arm" ]'
+      goarch: '[ "386", "amd64", "arm64", "ppc64le", "arm", "s390x" ]'
     secrets: inherit
 
   package-tests:

cmd/goreleaser/internal/configure.go

@@ -114,12 +114,13 @@ func Build(dist string, buildOrRest bool) config.Build {
 				Path: "artifacts/otelcol-contrib_{{ .Target }}" +
 					"/otelcol-contrib{{- if eq .Os \"windows\" }}.exe{{ end }}",
 			},
-			Goos:   goos,
-			Goarch: archs,
-			Goarm:  ArmVersions(dist),
-			Dir:    "_build",
-			Binary: dist,
-			Ignore: IgnoreBuildCombinations(dist),
+			Goos:    goos,
+			Goarch:  archs,
+			Goarm:   ArmVersions(dist),
+			Goppc64: Ppc64Versions(dist),
+			Dir:     "_build",
+			Binary:  dist,
+			Ignore:  IgnoreBuildCombinations(dist),
 		}
 	}
 
@@ -137,10 +138,11 @@ func Build(dist string, buildOrRest bool) config.Build {
 			Flags:   []string{"-trimpath"},
 			Ldflags: []string{"-s", "-w"},
 		},
-		Goos:   goos,
-		Goarch: archs,
-		Goarm:  ArmVersions(dist),
-		Ignore: IgnoreBuildCombinations(dist),
+		Goos:    goos,
+		Goarch:  archs,
+		Goarm:   ArmVersions(dist),
+		Goppc64: Ppc64Versions(dist),
+		Ignore:  IgnoreBuildCombinations(dist),
 	}
 }
 
@@ -165,6 +167,10 @@ func ArmVersions(dist string) []string {
 	return []string{"7"}
 }
 
+func Ppc64Versions(dist string) []string {
+	return []string{"power8"}
+}
+
 func Archives(dist string) []config.Archive {
 	return []config.Archive{
 		Archive(dist),

distributions/otelcol-contrib/.goreleaser-build.yaml

@@ -15,6 +15,8 @@ builds:
       - s390x
     goarm:
       - "7"
+    goppc64:
+      - power8
     ignore:
       - goos: darwin
         goarch: "386"

distributions/otelcol-contrib/.goreleaser.yaml

@@ -24,6 +24,8 @@ builds:
       - s390x
     goarm:
       - "7"
+    goppc64:
+      - power8
     ignore:
       - goos: darwin
         goarch: "386"

distributions/otelcol-k8s/.goreleaser.yaml

@@ -11,6 +11,8 @@ builds:
       - arm64
       - ppc64le
       - s390x
+    goppc64:
+      - power8
     dir: _build
     binary: otelcol-k8s
     ldflags:

distributions/otelcol-otlp/.goreleaser.yaml

@@ -23,6 +23,8 @@ builds:
       - s390x
     goarm:
       - "7"
+    goppc64:
+      - power8
     ignore:
       - goos: darwin
         goarch: "386"