Skip to content

Commit bee27c3

Browse files
mowiesmowies
authored
[chore] Remove unneeded build combinations and inconsistencies (#850)
* remove unneeded build combinations from pipelines Signed-off-by: Moritz Wiesinger <[email protected]> * remove ppc64le from windows goreleaser configs Signed-off-by: Moritz Wiesinger <[email protected]> * remove unneeded ppc64 variable from windows goreleaser configs Signed-off-by: Moritz Wiesinger <[email protected]> * use more consistent pipeline names, abbreviate continuous integration for better readability Signed-off-by: Moritz Wiesinger <[email protected]> * move ignore statements Signed-off-by: Moritz Wiesinger <[email protected]> * move ignore statements Signed-off-by: Moritz Wiesinger <[email protected]> --------- Signed-off-by: Moritz Wiesinger <[email protected]>
1 parent a6e9595 commit bee27c3

15 files changed

+23
-23
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ jobs:
4141
GOARCH: arm
4242
- GOOS: windows
4343
GOARCH: s390x
44+
- GOOS: darwin
45+
GOARCH: ppc64le
46+
- GOOS: windows
47+
GOARCH: ppc64le
4448
runs-on: ubuntu-24.04
4549

4650
steps:

‎.github/workflows/base-release.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ jobs:
3636
GOARCH: arm
3737
- GOOS: windows
3838
GOARCH: s390x
39+
- GOOS: darwin
40+
GOARCH: ppc64le
41+
- GOOS: windows
42+
GOARCH: ppc64le
3943
runs-on: ubuntu-24.04
4044

4145
steps:

‎.github/workflows/builder-release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Builder - Release
1+
name: Release Builder
22
on:
33
push:
44
tags:

‎.github/workflows/builder-testbuild.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Builder - Check and Test Build
1+
name: CI - Builder
22

33
on:
44
merge_group:

‎.github/workflows/changelog.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# or if performing maintance on the Changelog, add either \"[chore]\" to the title of
44
# the pull request or add the \"Skip Changelog\" label to disable this action.
55

6-
name: changelog
6+
name: Changelog
77

88
on:
99
pull_request:

‎.github/workflows/ci-goreleaser-contrib.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Continuous Integration - Contrib - GoReleaser
1+
name: CI - Contrib - GoReleaser
22

33
on:
44
merge_group:
@@ -25,7 +25,7 @@ on:
2525

2626
jobs:
2727
check-goreleaser:
28-
name: Continuous Integration - Contrib - GoReleaser
28+
name: CI - Contrib - GoReleaser
2929
uses: ./.github/workflows/base-ci-goreleaser.yaml
3030
with:
3131
distribution: otelcol-contrib

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Continuous Integration - Core - GoReleaser
1+
name: CI - Core - GoReleaser
22

33
on:
44
merge_group:
@@ -25,7 +25,7 @@ on:
2525

2626
jobs:
2727
check-goreleaser:
28-
name: Continuous Integration - Core - GoReleaser
28+
name: CI - Core - GoReleaser
2929
uses: ./.github/workflows/base-ci-goreleaser.yaml
3030
with:
3131
distribution: otelcol

‎.github/workflows/ci-goreleaser-k8s.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Continuous Integration - k8s - GoReleaser
1+
name: CI - k8s - GoReleaser
22

33
on:
44
merge_group:
@@ -25,7 +25,7 @@ on:
2525

2626
jobs:
2727
check-goreleaser:
28-
name: Continuous Integration - k8s - GoReleaser
28+
name: CI - k8s - GoReleaser
2929
uses: ./.github/workflows/base-ci-goreleaser.yaml
3030
with:
3131
distribution: otelcol-k8s

‎.github/workflows/ci-goreleaser-otlp.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Continuous Integration - OTLP - GoReleaser
1+
name: CI - OTLP - GoReleaser
22

33
on:
44
merge_group:
@@ -25,7 +25,7 @@ on:
2525

2626
jobs:
2727
check-goreleaser:
28-
name: Continuous Integration - OTLP - GoReleaser
28+
name: CI - OTLP - GoReleaser
2929
uses: ./.github/workflows/base-ci-goreleaser.yaml
3030
with:
3131
distribution: otelcol-otlp

‎.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Continuous Integration
1+
name: CI - Binaries
22

33
on:
44
merge_group:

‎cmd/goreleaser/internal/configure.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ const (
4141

4242
var (
4343
baseArchs = []string{"386", "amd64", "arm", "arm64", "ppc64le", "s390x"}
44-
winArchs = []string{"386", "amd64", "arm64", "ppc64le"}
44+
winArchs = []string{"386", "amd64", "arm64"}
4545
darwinArchs = []string{"amd64", "arm64"}
4646
k8sArchs = []string{"amd64", "arm64", "ppc64le", "s390x"}
4747

@@ -52,7 +52,7 @@ var (
5252
d.buildConfigs = []buildConfig{
5353
&fullBuildConfig{targetOS: "linux", targetArch: baseArchs, armVersion: []string{"7"}, ppc64Version: []string{"power8"}},
5454
&fullBuildConfig{targetOS: "darwin", targetArch: darwinArchs},
55-
&fullBuildConfig{targetOS: "windows", targetArch: winArchs, ppc64Version: []string{"power8"}},
55+
&fullBuildConfig{targetOS: "windows", targetArch: winArchs},
5656
}
5757
d.containerImages = newContainerImages(d.name, "linux", baseArchs, containerImageOptions{armVersion: "7"})
5858
d.containerImageManifests = newContainerImageManifests(d.name, "linux", baseArchs)
@@ -63,7 +63,7 @@ var (
6363
d.buildConfigs = []buildConfig{
6464
&fullBuildConfig{targetOS: "linux", targetArch: baseArchs, armVersion: []string{"7"}, ppc64Version: []string{"power8"}},
6565
&fullBuildConfig{targetOS: "darwin", targetArch: darwinArchs},
66-
&fullBuildConfig{targetOS: "windows", targetArch: winArchs, ppc64Version: []string{"power8"}},
66+
&fullBuildConfig{targetOS: "windows", targetArch: winArchs},
6767
}
6868
d.containerImages = newContainerImages(d.name, "linux", baseArchs, containerImageOptions{armVersion: "7"})
6969
d.containerImageManifests = newContainerImageManifests(d.name, "linux", baseArchs)

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ builds:
4343
- "386"
4444
- amd64
4545
- arm64
46-
- ppc64le
4746
dir: _build
4847
binary: otelcol-contrib
4948
ldflags:

‎distributions/otelcol-contrib/.goreleaser.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ builds:
5454
- "386"
5555
- amd64
5656
- arm64
57-
- ppc64le
5857
goarm:
5958
- "7"
6059
goppc64:

‎distributions/otelcol-otlp/.goreleaser.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,6 @@ builds:
5151
- "386"
5252
- amd64
5353
- arm64
54-
- ppc64le
55-
goppc64:
56-
- power8
5754
dir: _build
5855
binary: otelcol-otlp
5956
ldflags:

‎distributions/otelcol/.goreleaser.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,6 @@ builds:
5252
- "386"
5353
- amd64
5454
- arm64
55-
- ppc64le
56-
goppc64:
57-
- power8
5855
dir: _build
5956
binary: otelcol
6057
ldflags:

0 commit comments

Comments
 (0)