[chore] Remove unneeded build combinations and inconsistencies (#850)

mowies · web-flow · commit bee27c3c605b · 2025-03-04T16:17:24.000Z
* remove unneeded build combinations from pipelines

Signed-off-by: Moritz Wiesinger &lt;moritz.wiesinger@dynatrace.com&gt;

* remove ppc64le from windows goreleaser configs

Signed-off-by: Moritz Wiesinger &lt;moritz.wiesinger@dynatrace.com&gt;

* remove unneeded ppc64 variable from windows goreleaser configs

Signed-off-by: Moritz Wiesinger &lt;moritz.wiesinger@dynatrace.com&gt;

* use more consistent pipeline names, abbreviate continuous integration for better readability

Signed-off-by: Moritz Wiesinger &lt;moritz.wiesinger@dynatrace.com&gt;

* move ignore statements

Signed-off-by: Moritz Wiesinger &lt;moritz.wiesinger@dynatrace.com&gt;

* move ignore statements

Signed-off-by: Moritz Wiesinger &lt;moritz.wiesinger@dynatrace.com&gt;

---------

Signed-off-by: Moritz Wiesinger &lt;moritz.wiesinger@dynatrace.com&gt;
diff --git a/.github/workflows/base-ci-goreleaser.yaml b/.github/workflows/base-ci-goreleaser.yaml
@@ -41,6 +41,10 @@ jobs:
             GOARCH: arm
           - GOOS: windows
             GOARCH: s390x
+          - GOOS: darwin
+            GOARCH: ppc64le
+          - GOOS: windows
+            GOARCH: ppc64le
     runs-on: ubuntu-24.04
 
     steps:
diff --git a/.github/workflows/base-release.yaml b/.github/workflows/base-release.yaml
@@ -36,6 +36,10 @@ jobs:
             GOARCH: arm
           - GOOS: windows
             GOARCH: s390x
+          - GOOS: darwin
+            GOARCH: ppc64le
+          - GOOS: windows
+            GOARCH: ppc64le
     runs-on: ubuntu-24.04
 
     steps:
diff --git a/.github/workflows/builder-release.yaml b/.github/workflows/builder-release.yaml
@@ -1,4 +1,4 @@
-name: Builder - Release
+name: Release Builder
 on:
   push:
     tags:
diff --git a/.github/workflows/builder-testbuild.yaml b/.github/workflows/builder-testbuild.yaml
@@ -1,4 +1,4 @@
-name: Builder - Check and Test Build
+name: CI - Builder
 
 on:
   merge_group: 
diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
@@ -3,7 +3,7 @@
 # or if performing maintance on the Changelog, add either \"[chore]\" to the title of
 # the pull request or add the \"Skip Changelog\" label to disable this action.
 
-name: changelog
+name: Changelog
 
 on:
   pull_request:
diff --git a/.github/workflows/ci-goreleaser-contrib.yaml b/.github/workflows/ci-goreleaser-contrib.yaml
@@ -1,4 +1,4 @@
-name: Continuous Integration - Contrib - GoReleaser
+name: CI - Contrib - GoReleaser
 
 on:
   merge_group: 
@@ -25,7 +25,7 @@ on:
 
 jobs:
   check-goreleaser:
-    name: Continuous Integration - Contrib - GoReleaser
+    name: CI - Contrib - GoReleaser
     uses: ./.github/workflows/base-ci-goreleaser.yaml
     with:
       distribution: otelcol-contrib
diff --git a/.github/workflows/ci-goreleaser-core.yaml b/.github/workflows/ci-goreleaser-core.yaml
@@ -1,4 +1,4 @@
-name: Continuous Integration - Core - GoReleaser
+name: CI - Core - GoReleaser
 
 on:
   merge_group: 
@@ -25,7 +25,7 @@ on:
 
 jobs:
   check-goreleaser:
-    name: Continuous Integration - Core - GoReleaser
+    name: CI - Core - GoReleaser
     uses: ./.github/workflows/base-ci-goreleaser.yaml
     with:
       distribution: otelcol
diff --git a/.github/workflows/ci-goreleaser-k8s.yaml b/.github/workflows/ci-goreleaser-k8s.yaml
@@ -1,4 +1,4 @@
-name: Continuous Integration - k8s - GoReleaser
+name: CI - k8s - GoReleaser
 
 on:
   merge_group: 
@@ -25,7 +25,7 @@ on:
 
 jobs:
   check-goreleaser:
-    name: Continuous Integration - k8s - GoReleaser
+    name: CI - k8s - GoReleaser
     uses: ./.github/workflows/base-ci-goreleaser.yaml
     with:
       distribution: otelcol-k8s
diff --git a/.github/workflows/ci-goreleaser-otlp.yaml b/.github/workflows/ci-goreleaser-otlp.yaml
@@ -1,4 +1,4 @@
-name: Continuous Integration - OTLP - GoReleaser
+name: CI - OTLP - GoReleaser
 
 on:
   merge_group: 
@@ -25,7 +25,7 @@ on:
 
 jobs:
   check-goreleaser:
-    name: Continuous Integration - OTLP - GoReleaser
+    name: CI - OTLP - GoReleaser
     uses: ./.github/workflows/base-ci-goreleaser.yaml
     with:
       distribution: otelcol-otlp
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -1,4 +1,4 @@
-name: Continuous Integration
+name: CI - Binaries
 
 on:
   merge_group: 
diff --git a/cmd/goreleaser/internal/configure.go b/cmd/goreleaser/internal/configure.go
@@ -41,7 +41,7 @@ const (
 
 var (
 	baseArchs   = []string{"386", "amd64", "arm", "arm64", "ppc64le", "s390x"}
-	winArchs    = []string{"386", "amd64", "arm64", "ppc64le"}
+	winArchs    = []string{"386", "amd64", "arm64"}
 	darwinArchs = []string{"amd64", "arm64"}
 	k8sArchs    = []string{"amd64", "arm64", "ppc64le", "s390x"}
 
@@ -52,7 +52,7 @@ var (
 		d.buildConfigs = []buildConfig{
 			&fullBuildConfig{targetOS: "linux", targetArch: baseArchs, armVersion: []string{"7"}, ppc64Version: []string{"power8"}},
 			&fullBuildConfig{targetOS: "darwin", targetArch: darwinArchs},
-			&fullBuildConfig{targetOS: "windows", targetArch: winArchs, ppc64Version: []string{"power8"}},
+			&fullBuildConfig{targetOS: "windows", targetArch: winArchs},
 		}
 		d.containerImages = newContainerImages(d.name, "linux", baseArchs, containerImageOptions{armVersion: "7"})
 		d.containerImageManifests = newContainerImageManifests(d.name, "linux", baseArchs)
@@ -63,7 +63,7 @@ var (
 		d.buildConfigs = []buildConfig{
 			&fullBuildConfig{targetOS: "linux", targetArch: baseArchs, armVersion: []string{"7"}, ppc64Version: []string{"power8"}},
 			&fullBuildConfig{targetOS: "darwin", targetArch: darwinArchs},
-			&fullBuildConfig{targetOS: "windows", targetArch: winArchs, ppc64Version: []string{"power8"}},
+			&fullBuildConfig{targetOS: "windows", targetArch: winArchs},
 		}
 		d.containerImages = newContainerImages(d.name, "linux", baseArchs, containerImageOptions{armVersion: "7"})
 		d.containerImageManifests = newContainerImageManifests(d.name, "linux", baseArchs)
diff --git a/distributions/otelcol-contrib/.goreleaser-build.yaml b/distributions/otelcol-contrib/.goreleaser-build.yaml
@@ -43,7 +43,6 @@ builds:
       - "386"
       - amd64
       - arm64
-      - ppc64le
     dir: _build
     binary: otelcol-contrib
     ldflags:
diff --git a/distributions/otelcol-contrib/.goreleaser.yaml b/distributions/otelcol-contrib/.goreleaser.yaml
@@ -54,7 +54,6 @@ builds:
       - "386"
       - amd64
       - arm64
-      - ppc64le
     goarm:
       - "7"
     goppc64:
diff --git a/distributions/otelcol-otlp/.goreleaser.yaml b/distributions/otelcol-otlp/.goreleaser.yaml
@@ -51,9 +51,6 @@ builds:
       - "386"
       - amd64
       - arm64
-      - ppc64le
-    goppc64:
-      - power8
     dir: _build
     binary: otelcol-otlp
     ldflags:
diff --git a/distributions/otelcol/.goreleaser.yaml b/distributions/otelcol/.goreleaser.yaml
@@ -52,9 +52,6 @@ builds:
       - "386"
       - amd64
       - arm64
-      - ppc64le
-    goppc64:
-      - power8
     dir: _build
     binary: otelcol
     ldflags:

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-name: Builder - Release`
	`1`	`+name: Release Builder`
`2`	`2`	`on:`
`3`	`3`	`push:`
`4`	`4`	`tags:`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-name: Builder - Check and Test Build`
	`1`	`+name: CI - Builder`
`2`	`2`
`3`	`3`	`on:`
`4`	`4`	`merge_group:`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-name: Continuous Integration`
	`1`	`+name: CI - Binaries`
`2`	`2`
`3`	`3`	`on:`
`4`	`4`	`merge_group:`