From 0fb35c2b09849eaa3401a4bfdba34f134f11cf52 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 29 Jan 2025 10:16:27 +0000 Subject: [PATCH 1/3] fix(deps): update goreleaser pro --- .github/workflows/base-ci-goreleaser.yaml | 2 +- .github/workflows/base-release.yaml | 2 +- .github/workflows/builder-release.yaml | 2 +- .github/workflows/builder-testbuild.yaml | 2 +- go.mod | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/base-ci-goreleaser.yaml b/.github/workflows/base-ci-goreleaser.yaml index 043fbade..d2297110 100644 --- a/.github/workflows/base-ci-goreleaser.yaml +++ b/.github/workflows/base-ci-goreleaser.yaml @@ -20,7 +20,7 @@ on: env: # renovate: datasource=github-tags depName=goreleaser-pro packageName=goreleaser/goreleaser-pro - GORELEASER_PRO_VERSION: v2.4.8 + GORELEASER_PRO_VERSION: v2.6.1 jobs: check-goreleaser: diff --git a/.github/workflows/base-release.yaml b/.github/workflows/base-release.yaml index cb4fdc24..640c6906 100644 --- a/.github/workflows/base-release.yaml +++ b/.github/workflows/base-release.yaml @@ -15,7 +15,7 @@ on: env: # renovate: datasource=github-tags depName=goreleaser-pro packageName=goreleaser/goreleaser-pro - GORELEASER_PRO_VERSION: v2.4.8 + GORELEASER_PRO_VERSION: v2.6.1 jobs: prepare: diff --git a/.github/workflows/builder-release.yaml b/.github/workflows/builder-release.yaml index dda939e2..0a07a088 100644 --- a/.github/workflows/builder-release.yaml +++ b/.github/workflows/builder-release.yaml @@ -6,7 +6,7 @@ on: env: # renovate: datasource=github-tags depName=goreleaser-pro packageName=goreleaser/goreleaser-pro - GORELEASER_PRO_VERSION: v2.4.8 + GORELEASER_PRO_VERSION: v2.6.1 jobs: goreleaser: diff --git a/.github/workflows/builder-testbuild.yaml b/.github/workflows/builder-testbuild.yaml index e21cc959..1a6068e4 100644 --- a/.github/workflows/builder-testbuild.yaml +++ b/.github/workflows/builder-testbuild.yaml @@ -25,7 +25,7 @@ on: env: # renovate: datasource=github-tags depName=goreleaser-pro packageName=goreleaser/goreleaser-pro - GORELEASER_PRO_VERSION: v2.4.8 + GORELEASER_PRO_VERSION: v2.6.1 jobs: check-goreleaser: diff --git a/go.mod b/go.mod index 11d519a7..15d5a94f 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-releases go 1.23 require ( - github.com/goreleaser/goreleaser-pro/v2 v2.4.8-pro + github.com/goreleaser/goreleaser-pro/v2 v2.6.1-pro gopkg.in/yaml.v3 v3.0.1 ) From 5ad147e0c5beafbff41efff3599a93c627823b98 Mon Sep 17 00:00:00 2001 From: Moritz Wiesinger Date: Wed, 29 Jan 2025 12:55:23 +0100 Subject: [PATCH 2/3] update config, add debug steps for future, add missing env vars Signed-off-by: Moritz Wiesinger try out with new nightly build Signed-off-by: Moritz Wiesinger add goppc64 goreleaser setting Signed-off-by: Moritz Wiesinger try with goppc64 env var Signed-off-by: Moritz Wiesinger add back goamd64 env var Signed-off-by: Moritz Wiesinger add back GOARM variable Signed-off-by: Moritz Wiesinger remove probably unneeded env vars Signed-off-by: Moritz Wiesinger revert unneeded changes Signed-off-by: Moritz Wiesinger try setting ppc64 variables Signed-off-by: Moritz Wiesinger prettify debug cmds Signed-off-by: Moritz Wiesinger add back v1 suffixes to upload tasks Signed-off-by: Moritz Wiesinger enable everything Signed-off-by: Moritz Wiesinger add back arm Signed-off-by: Moritz Wiesinger go back to nightly, remove experimental arm setting Signed-off-by: Moritz Wiesinger try with 2.6.1 Signed-off-by: Moritz Wiesinger try with all default settings Signed-off-by: Moritz Wiesinger again Signed-off-by: Moritz Wiesinger try agin Signed-off-by: Moritz Wiesinger try power9 Signed-off-by: Moritz Wiesinger just build ppc64le Signed-off-by: Moritz Wiesinger just run arm Signed-off-by: Moritz Wiesinger remove target setting Signed-off-by: Moritz Wiesinger try with env var Signed-off-by: Moritz Wiesinger try again Signed-off-by: Moritz Wiesinger explicitely set power8 and power9 Signed-off-by: Moritz Wiesinger add back ppc64le and see what happens Signed-off-by: Moritz Wiesinger go back to default arm v7 through experimental env var Signed-off-by: Moritz Wiesinger try setting completely wrong env var for GOARM Signed-off-by: Moritz Wiesinger revert Signed-off-by: Moritz Wiesinger try to update default arm version with experimental variable Signed-off-by: Moritz Wiesinger try with integer instead of string for arm version Signed-off-by: Moritz Wiesinger add arm to core, remove others for faster build times Signed-off-by: Moritz Wiesinger add back more architectures Signed-off-by: Moritz Wiesinger remove archive from contrib build-only config Signed-off-by: Moritz Wiesinger add arm64 builds Signed-off-by: Moritz Wiesinger fix msi upload task Signed-off-by: Moritz Wiesinger back to just amd64... Signed-off-by: Moritz Wiesinger remove ppc64le again Signed-off-by: Moritz Wiesinger add back systems and architectures Signed-off-by: Moritz Wiesinger correct artifacts.json name Signed-off-by: Moritz Wiesinger change dist folder name Signed-off-by: Moritz Wiesinger debug artifacts json file Signed-off-by: Moritz Wiesinger just show relevant folders Signed-off-by: Moritz Wiesinger update go mods Signed-off-by: Moritz Wiesinger just run amd64 again Signed-off-by: Moritz Wiesinger dockerfile from/as casing Signed-off-by: Moritz Wiesinger try with new goreleaser nightly build Signed-off-by: Moritz Wiesinger try setting target manually Signed-off-by: Moritz Wiesinger try to set goamd64 in goreleaser file directly Signed-off-by: Moritz Wiesinger remove windows from otelcol-contrib Signed-off-by: Moritz Wiesinger add back most arches to otelcol-core Signed-off-by: Moritz Wiesinger add back windows builds Signed-off-by: Moritz Wiesinger fix goamd64 setting Signed-off-by: Moritz Wiesinger fix path to upload artifacts Signed-off-by: Moritz Wiesinger cut down arches to just linux amd64 Signed-off-by: Moritz Wiesinger fix package upload Signed-off-by: Moritz Wiesinger go back to 2.6.1 Signed-off-by: Moritz Wiesinger less architectures Signed-off-by: Moritz Wiesinger more debugging - 2.6.0 Signed-off-by: Moritz Wiesinger more debugging - revert to 2.5.0 Signed-off-by: Moritz Wiesinger more debugging - revert to 2.5.1 Signed-off-by: Moritz Wiesinger debugging Signed-off-by: Moritz Wiesinger try to fix otlp build Signed-off-by: Moritz Wiesinger update nfpm config to new config object Signed-off-by: Moritz Wiesinger update deprecated field in builder config Signed-off-by: Moritz Wiesinger go mod tidy Signed-off-by: Moritz Wiesinger --- .github/workflows/base-ci-goreleaser.yaml | 20 +++++++--- .github/workflows/base-release.yaml | 5 ++- .github/workflows/builder-release.yaml | 2 +- .github/workflows/builder-testbuild.yaml | 2 +- cmd/builder/.goreleaser.yml | 3 +- cmd/goreleaser/internal/configure.go | 37 +++++++++++++------ .../otelcol-contrib/.goreleaser-build.yaml | 5 +++ .../otelcol-contrib/.goreleaser.yaml | 2 + distributions/otelcol-k8s/.goreleaser.yaml | 2 + distributions/otelcol-otlp/.goreleaser.yaml | 2 + distributions/otelcol/.goreleaser.yaml | 2 + go.mod | 2 +- go.sum | 4 +- internal/tools/go.mod | 3 +- internal/tools/go.sum | 4 +- 15 files changed, 66 insertions(+), 29 deletions(-) diff --git a/.github/workflows/base-ci-goreleaser.yaml b/.github/workflows/base-ci-goreleaser.yaml index d2297110..b77595c0 100644 --- a/.github/workflows/base-ci-goreleaser.yaml +++ b/.github/workflows/base-ci-goreleaser.yaml @@ -20,7 +20,7 @@ on: env: # renovate: datasource=github-tags depName=goreleaser-pro packageName=goreleaser/goreleaser-pro - GORELEASER_PRO_VERSION: v2.6.1 + GORELEASER_PRO_VERSION: nightly jobs: check-goreleaser: @@ -126,8 +126,9 @@ jobs: env: GOOS: ${{ matrix.GOOS }} GOARCH: ${{ matrix.GOARCH }} - GOARM: 7 # Default is 6 + GOARM: "7" # Default is 6 GOAMD64: v1 + GOPPC64: power8 GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }} - name: Move built artifacts @@ -148,11 +149,20 @@ jobs: env: GOOS: ${{ matrix.GOOS }} GOARCH: ${{ matrix.GOARCH }} - GOARM: 7 # Default is 6 + GOARM: "7" # Default is 6 + GOAMD64: v1 + GOPPC64: power8 GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }} + - name: Print built artifacts + run: cat ./distributions/${{ inputs.distribution }}/dist/**/artifacts.json + + - name: Print dist folder contents + if: always() + run: ls -laR ./distributions/${{ inputs.distribution }}/dist + - name: Upload linux service packages - if: ${{ matrix.GOOS == 'linux' && matrix.GOARCH == 'amd64' }} + if: ${{ matrix.GOOS == 'linux' && matrix.GOARCH == 'amd64' && (inputs.distribution == 'otelcol-contrib' || inputs.distribution == 'otelcol') }} uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 with: name: linux-packages @@ -160,7 +170,7 @@ jobs: if-no-files-found: error - name: Upload MSI packages - if: matrix.GOOS == 'windows' && matrix.GOARCH == 'amd64' + if: matrix.GOOS == 'windows' && matrix.GOARCH == 'amd64' && (inputs.distribution == 'otelcol-contrib' || inputs.distribution == 'otelcol') uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 with: name: msi-packages diff --git a/.github/workflows/base-release.yaml b/.github/workflows/base-release.yaml index 640c6906..1f3550f7 100644 --- a/.github/workflows/base-release.yaml +++ b/.github/workflows/base-release.yaml @@ -15,7 +15,7 @@ on: env: # renovate: datasource=github-tags depName=goreleaser-pro packageName=goreleaser/goreleaser-pro - GORELEASER_PRO_VERSION: v2.6.1 + GORELEASER_PRO_VERSION: nightly jobs: prepare: @@ -100,8 +100,9 @@ jobs: env: GOOS: ${{ matrix.GOOS }} GOARCH: ${{ matrix.GOARCH }} - GOARM: 7 # Default is 6 + GOARM: "7" # Default is 6 GOAMD64: v1 + GOPPC64: power8 GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }} GITHUB_TOKEN: ${{ secrets.GH_PAT }} COSIGN_YES: true diff --git a/.github/workflows/builder-release.yaml b/.github/workflows/builder-release.yaml index 0a07a088..9a9cdc75 100644 --- a/.github/workflows/builder-release.yaml +++ b/.github/workflows/builder-release.yaml @@ -6,7 +6,7 @@ on: env: # renovate: datasource=github-tags depName=goreleaser-pro packageName=goreleaser/goreleaser-pro - GORELEASER_PRO_VERSION: v2.6.1 + GORELEASER_PRO_VERSION: nightly jobs: goreleaser: diff --git a/.github/workflows/builder-testbuild.yaml b/.github/workflows/builder-testbuild.yaml index 1a6068e4..ed153545 100644 --- a/.github/workflows/builder-testbuild.yaml +++ b/.github/workflows/builder-testbuild.yaml @@ -25,7 +25,7 @@ on: env: # renovate: datasource=github-tags depName=goreleaser-pro packageName=goreleaser/goreleaser-pro - GORELEASER_PRO_VERSION: v2.6.1 + GORELEASER_PRO_VERSION: nightly jobs: check-goreleaser: diff --git a/cmd/builder/.goreleaser.yml b/cmd/builder/.goreleaser.yml index 0676967e..0f2f2a88 100644 --- a/cmd/builder/.goreleaser.yml +++ b/cmd/builder/.goreleaser.yml @@ -105,7 +105,8 @@ release: header: | ### Images and binaries for collector distributions here: https://github.com/open-telemetry/opentelemetry-collector-releases/releases/tag/{{ .Tag }} archives: - - format: binary + - formats: + - binary checksum: name_template: "checksums.txt" snapshot: diff --git a/cmd/goreleaser/internal/configure.go b/cmd/goreleaser/internal/configure.go index 091fbffa..f756d249 100644 --- a/cmd/goreleaser/internal/configure.go +++ b/cmd/goreleaser/internal/configure.go @@ -59,6 +59,13 @@ func GenerateContribBuildOnly(dist string, buildOrRest bool) config.Project { TagPrefix: "v", }, Partial: Partial, + Archives: []config.Archive{ + { + Formats: []string{ + "binary", + }, + }, + }, } } @@ -107,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), } } @@ -130,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), } } @@ -158,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), @@ -210,7 +223,7 @@ func Packages(dist string) []config.NFPM { // Package configures goreleaser to build a system package. // https://goreleaser.com/customization/nfpm/ func Package(dist string) config.NFPM { - nfpmContents := config.NFPMContents{ + nfpmContents := []config.NFPMContent{ { Source: fmt.Sprintf("%s.service", dist), Destination: path.Join("/lib", "systemd", "system", fmt.Sprintf("%s.service", dist)), @@ -222,7 +235,7 @@ func Package(dist string) config.NFPM { }, } if _, ok := DefaultConfigDists[dist]; ok { - nfpmContents = append(nfpmContents, &config.NFPMContent{ + nfpmContents = append(nfpmContents, config.NFPMContent{ Source: "config.yaml", Destination: path.Join("/etc", dist, "config.yaml"), Type: "config|noreplace", diff --git a/distributions/otelcol-contrib/.goreleaser-build.yaml b/distributions/otelcol-contrib/.goreleaser-build.yaml index 36d82931..d9210083 100644 --- a/distributions/otelcol-contrib/.goreleaser-build.yaml +++ b/distributions/otelcol-contrib/.goreleaser-build.yaml @@ -15,6 +15,8 @@ builds: - s390x goarm: - "7" + goppc64: + - power8 ignore: - goos: darwin goarch: "386" @@ -37,6 +39,9 @@ builds: - -trimpath env: - CGO_ENABLED=0 +archives: + - formats: + - binary monorepo: tag_prefix: v partial: diff --git a/distributions/otelcol-contrib/.goreleaser.yaml b/distributions/otelcol-contrib/.goreleaser.yaml index f3d520c9..ea5763f7 100644 --- a/distributions/otelcol-contrib/.goreleaser.yaml +++ b/distributions/otelcol-contrib/.goreleaser.yaml @@ -24,6 +24,8 @@ builds: - s390x goarm: - "7" + goppc64: + - power8 ignore: - goos: darwin goarch: "386" diff --git a/distributions/otelcol-k8s/.goreleaser.yaml b/distributions/otelcol-k8s/.goreleaser.yaml index bd0457bf..548aa225 100644 --- a/distributions/otelcol-k8s/.goreleaser.yaml +++ b/distributions/otelcol-k8s/.goreleaser.yaml @@ -11,6 +11,8 @@ builds: - arm64 - ppc64le - s390x + goppc64: + - power8 dir: _build binary: otelcol-k8s ldflags: diff --git a/distributions/otelcol-otlp/.goreleaser.yaml b/distributions/otelcol-otlp/.goreleaser.yaml index e4d91850..d61231df 100644 --- a/distributions/otelcol-otlp/.goreleaser.yaml +++ b/distributions/otelcol-otlp/.goreleaser.yaml @@ -23,6 +23,8 @@ builds: - s390x goarm: - "7" + goppc64: + - power8 ignore: - goos: darwin goarch: "386" diff --git a/distributions/otelcol/.goreleaser.yaml b/distributions/otelcol/.goreleaser.yaml index 8a73d0df..ecd17fc9 100644 --- a/distributions/otelcol/.goreleaser.yaml +++ b/distributions/otelcol/.goreleaser.yaml @@ -24,6 +24,8 @@ builds: - s390x goarm: - "7" + goppc64: + - power8 ignore: - goos: darwin goarch: "386" diff --git a/go.mod b/go.mod index 15d5a94f..a8bee2de 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-releases go 1.23 require ( - github.com/goreleaser/goreleaser-pro/v2 v2.6.1-pro + github.com/goreleaser/goreleaser-pro/v2 v2.6.1-pro.0.20250124221731-55793ed06c38 gopkg.in/yaml.v3 v3.0.1 ) diff --git a/go.sum b/go.sum index d2dbf057..b705f596 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,6 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/goreleaser/goreleaser-pro/v2 v2.4.8-pro h1:crnjm84+p9HnuVGkq12T4fkKJQddR5bdu6kA5KoiNq8= -github.com/goreleaser/goreleaser-pro/v2 v2.4.8-pro/go.mod h1:GA7Uzk7qKA3efeDmgfWwcMTrDJe+V7D6H5RMqXlFvuc= +github.com/goreleaser/goreleaser-pro/v2 v2.6.1-pro.0.20250124221731-55793ed06c38 h1:sUm749cGYu3LfFAoDYLDMHac6abyS1i/kupv+vjiEsc= +github.com/goreleaser/goreleaser-pro/v2 v2.6.1-pro.0.20250124221731-55793ed06c38/go.mod h1:GA7Uzk7qKA3efeDmgfWwcMTrDJe+V7D6H5RMqXlFvuc= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= diff --git a/internal/tools/go.mod b/internal/tools/go.mod index a026c79f..d615eba3 100644 --- a/internal/tools/go.mod +++ b/internal/tools/go.mod @@ -4,7 +4,7 @@ go 1.23 toolchain go1.23.2 -require go.opentelemetry.io/build-tools/chloggen v0.15.0 +require go.opentelemetry.io/build-tools/chloggen v0.17.0 require ( github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect @@ -14,7 +14,6 @@ require ( github.com/rogpeppe/go-internal v1.13.1 // indirect github.com/spf13/cobra v1.8.1 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/stretchr/testify v1.10.0 // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/internal/tools/go.sum b/internal/tools/go.sum index a49cf65a..7ee815d6 100644 --- a/internal/tools/go.sum +++ b/internal/tools/go.sum @@ -24,8 +24,8 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -go.opentelemetry.io/build-tools/chloggen v0.15.0 h1:G5UeYUgP6x4QXie0yNs/6TjK9nCuuVXgXeDWE9/cxQQ= -go.opentelemetry.io/build-tools/chloggen v0.15.0/go.mod h1:oovDPiOQS4iruTVH469/68hEYjWC48c8u+qJpWJc8Eg= +go.opentelemetry.io/build-tools/chloggen v0.17.0 h1:aOtA6MW67VoB1HYxcqYIlVxfiBypI/ZTxSb7SU/Jw8g= +go.opentelemetry.io/build-tools/chloggen v0.17.0/go.mod h1:Wk92v9Wsv36sXYi7hOg3ndeeLKmKBu0/kgB7wcaeqJg= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= From 58e940f4e9447202c049f42c25afee465ace9b18 Mon Sep 17 00:00:00 2001 From: Moritz Wiesinger Date: Tue, 11 Feb 2025 12:48:48 +0100 Subject: [PATCH 3/3] update to gereleaser-pro v2.7.0 Signed-off-by: Moritz Wiesinger --- .github/workflows/base-ci-goreleaser.yaml | 2 +- .github/workflows/base-release.yaml | 2 +- .github/workflows/builder-release.yaml | 2 +- .github/workflows/builder-testbuild.yaml | 2 +- go.mod | 2 +- go.sum | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/base-ci-goreleaser.yaml b/.github/workflows/base-ci-goreleaser.yaml index b77595c0..ac790f61 100644 --- a/.github/workflows/base-ci-goreleaser.yaml +++ b/.github/workflows/base-ci-goreleaser.yaml @@ -20,7 +20,7 @@ on: env: # renovate: datasource=github-tags depName=goreleaser-pro packageName=goreleaser/goreleaser-pro - GORELEASER_PRO_VERSION: nightly + GORELEASER_PRO_VERSION: v2.7.0 jobs: check-goreleaser: diff --git a/.github/workflows/base-release.yaml b/.github/workflows/base-release.yaml index cde6a00b..1af49e3a 100644 --- a/.github/workflows/base-release.yaml +++ b/.github/workflows/base-release.yaml @@ -15,7 +15,7 @@ on: env: # renovate: datasource=github-tags depName=goreleaser-pro packageName=goreleaser/goreleaser-pro - GORELEASER_PRO_VERSION: nightly + GORELEASER_PRO_VERSION: v2.7.0 jobs: prepare: diff --git a/.github/workflows/builder-release.yaml b/.github/workflows/builder-release.yaml index a4894498..23f69557 100644 --- a/.github/workflows/builder-release.yaml +++ b/.github/workflows/builder-release.yaml @@ -6,7 +6,7 @@ on: env: # renovate: datasource=github-tags depName=goreleaser-pro packageName=goreleaser/goreleaser-pro - GORELEASER_PRO_VERSION: nightly + GORELEASER_PRO_VERSION: v2.7.0 jobs: goreleaser: diff --git a/.github/workflows/builder-testbuild.yaml b/.github/workflows/builder-testbuild.yaml index 4267a6ef..d5f77248 100644 --- a/.github/workflows/builder-testbuild.yaml +++ b/.github/workflows/builder-testbuild.yaml @@ -25,7 +25,7 @@ on: env: # renovate: datasource=github-tags depName=goreleaser-pro packageName=goreleaser/goreleaser-pro - GORELEASER_PRO_VERSION: nightly + GORELEASER_PRO_VERSION: v2.7.0 jobs: check-goreleaser: diff --git a/go.mod b/go.mod index a8bee2de..305b9759 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-releases go 1.23 require ( - github.com/goreleaser/goreleaser-pro/v2 v2.6.1-pro.0.20250124221731-55793ed06c38 + github.com/goreleaser/goreleaser-pro/v2 v2.7.0 gopkg.in/yaml.v3 v3.0.1 ) diff --git a/go.sum b/go.sum index b705f596..31f4ceb2 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,6 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/goreleaser/goreleaser-pro/v2 v2.6.1-pro.0.20250124221731-55793ed06c38 h1:sUm749cGYu3LfFAoDYLDMHac6abyS1i/kupv+vjiEsc= -github.com/goreleaser/goreleaser-pro/v2 v2.6.1-pro.0.20250124221731-55793ed06c38/go.mod h1:GA7Uzk7qKA3efeDmgfWwcMTrDJe+V7D6H5RMqXlFvuc= +github.com/goreleaser/goreleaser-pro/v2 v2.7.0 h1:07p7y2N3chwz1MIs5HwnkTE/OUo63asEQeuPyVP6eag= +github.com/goreleaser/goreleaser-pro/v2 v2.7.0/go.mod h1:GA7Uzk7qKA3efeDmgfWwcMTrDJe+V7D6H5RMqXlFvuc= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=