fix(deps): update goreleaser pro (#779)
* fix(deps): update goreleaser pro * update config, add debug steps for future, add missing env vars Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> try out with new nightly build Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> add goppc64 goreleaser setting Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> try with goppc64 env var Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> add back goamd64 env var Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> add back GOARM variable Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> remove probably unneeded env vars Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> revert unneeded changes Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> try setting ppc64 variables Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> prettify debug cmds Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> add back v1 suffixes to upload tasks Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> enable everything Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> add back arm Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> go back to nightly, remove experimental arm setting Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> try with 2.6.1 Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> try with all default settings Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> again Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> try agin Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> try power9 Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> just build ppc64le Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> just run arm Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> remove target setting Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> try with env var Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> try again Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> explicitely set power8 and power9 Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> add back ppc64le and see what happens Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> go back to default arm v7 through experimental env var Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> try setting completely wrong env var for GOARM Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> revert Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> try to update default arm version with experimental variable Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> try with integer instead of string for arm version Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> add arm to core, remove others for faster build times Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> add back more architectures Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> remove archive from contrib build-only config Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> add arm64 builds Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> fix msi upload task Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> back to just amd64... Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> remove ppc64le again Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> add back systems and architectures Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> correct artifacts.json name Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> change dist folder name Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> debug artifacts json file Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> just show relevant folders Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> update go mods Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> just run amd64 again Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> dockerfile from/as casing Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> try with new goreleaser nightly build Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> try setting target manually Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> try to set goamd64 in goreleaser file directly Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> remove windows from otelcol-contrib Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> add back most arches to otelcol-core Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> add back windows builds Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> fix goamd64 setting Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> fix path to upload artifacts Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> cut down arches to just linux amd64 Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> fix package upload Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> go back to 2.6.1 Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> less architectures Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> more debugging - 2.6.0 Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> more debugging - revert to 2.5.0 Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> more debugging - revert to 2.5.1 Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> debugging Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> try to fix otlp build Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> update nfpm config to new config object Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> update deprecated field in builder config Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> go mod tidy Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> * update to gereleaser-pro v2.7.0 Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> --------- Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com>
This commit is contained in:
renovate[bot]
GitHub
parent
587f76552b
commit
00024a93a4
|
|
@ -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.7.0
|
||||
|
||||
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
|
||||
|
|
|
|||
|
|
@ -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.7.0
|
||||
|
||||
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
|
||||
|
|
|
|||
|
|
@ -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.7.0
|
||||
|
||||
jobs:
|
||||
goreleaser:
|
||||
|
|
|
|||
|
|
@ -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.7.0
|
||||
|
||||
jobs:
|
||||
check-goreleaser:
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -24,6 +24,8 @@ builds:
|
|||
- s390x
|
||||
goarm:
|
||||
- "7"
|
||||
goppc64:
|
||||
- power8
|
||||
ignore:
|
||||
- goos: darwin
|
||||
goarch: "386"
|
||||
|
|
|
|||
|
|
@ -11,6 +11,8 @@ builds:
|
|||
- arm64
|
||||
- ppc64le
|
||||
- s390x
|
||||
goppc64:
|
||||
- power8
|
||||
dir: _build
|
||||
binary: otelcol-k8s
|
||||
ldflags:
|
||||
|
|
|
|||
|
|
@ -23,6 +23,8 @@ builds:
|
|||
- s390x
|
||||
goarm:
|
||||
- "7"
|
||||
goppc64:
|
||||
- power8
|
||||
ignore:
|
||||
- goos: darwin
|
||||
goarch: "386"
|
||||
|
|
|
|||
|
|
@ -24,6 +24,8 @@ builds:
|
|||
- s390x
|
||||
goarm:
|
||||
- "7"
|
||||
goppc64:
|
||||
- power8
|
||||
ignore:
|
||||
- goos: darwin
|
||||
goarch: "386"
|
||||
|
|
|
|||
2
go.mod
2
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.7.0
|
||||
gopkg.in/yaml.v3 v3.0.1
|
||||
)
|
||||
|
||||
|
|
|
|||
4
go.sum
4
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.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=
|
||||
|
|
|
|||
Loading…
Reference in New Issue