Skip to content

Commit 46c364b

Browse files
committed
revert goreleaser debugging changes
1 parent e7e421b commit 46c364b

5 files changed

Lines changed: 18 additions & 19 deletions

File tree

cmd/goreleaser/internal/configure.go

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,7 @@ var (
4949
k8sArchs = []string{"amd64", "arm64", "ppc64le", "s390x"}
5050
ebpfProfilerArchs = []string{"amd64"}
5151

52-
// imageRepos = []string{dockerHub, ghcr}
53-
imageRepos = []string{ghcr}
52+
imageRepos = []string{dockerHub, ghcr}
5453

5554
// otelcol (core) distro
5655
otelColDist = newDistributionBuilder(coreDistro).WithConfigFunc(func(d *distribution) {
@@ -456,19 +455,19 @@ func (d *distribution) BuildProject() config.Project {
456455
Release: config.Release{
457456
ReplaceExistingArtifacts: true,
458457
},
459-
Checksum: d.checksum,
460-
Env: env,
461-
Builds: builds,
462-
Archives: d.archives,
463-
MSI: d.msiConfig,
464-
NFPMs: d.nfpms,
465-
Dockers: d.containerImages,
466-
// DockerManifests: d.containerImageManifests,
467-
Signs: d.signs,
468-
DockerSigns: d.dockerSigns,
469-
SBOMs: d.sboms,
470-
Nightly: d.nightly,
471-
Version: 2,
458+
Checksum: d.checksum,
459+
Env: env,
460+
Builds: builds,
461+
Archives: d.archives,
462+
MSI: d.msiConfig,
463+
NFPMs: d.nfpms,
464+
Dockers: d.containerImages,
465+
DockerManifests: d.containerImageManifests,
466+
Signs: d.signs,
467+
DockerSigns: d.dockerSigns,
468+
SBOMs: d.sboms,
469+
Nightly: d.nightly,
470+
Version: 2,
472471
Monorepo: config.Monorepo{
473472
TagPrefix: "v",
474473
},

distributions/otelcol-contrib/.goreleaser.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,6 @@ partial:
332332
by: target
333333
nightly:
334334
version_template: '{{ incpatch .Version}}-nightly.{{ .Now.Format "200601021504" }}'
335-
tag_name: nightly
335+
tag_name: nightly-otelcol-contrib
336336
publish_release: true
337337
keep_single_release: true

distributions/otelcol-k8s/.goreleaser.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,6 @@ partial:
212212
by: target
213213
nightly:
214214
version_template: '{{ incpatch .Version}}-nightly.{{ .Now.Format "200601021504" }}'
215-
tag_name: nightly
215+
tag_name: nightly-otelcol-k8s
216216
publish_release: true
217217
keep_single_release: true

distributions/otelcol-otlp/.goreleaser.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,6 +307,6 @@ partial:
307307
by: target
308308
nightly:
309309
version_template: '{{ incpatch .Version}}-nightly.{{ .Now.Format "200601021504" }}'
310-
tag_name: nightly
310+
tag_name: nightly-otelcol-otlp
311311
publish_release: true
312312
keep_single_release: true

distributions/otelcol/.goreleaser.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,6 @@ partial:
327327
by: target
328328
nightly:
329329
version_template: '{{ incpatch .Version}}-nightly.{{ .Now.Format "200601021504" }}'
330-
tag_name: nightly
330+
tag_name: nightly-otelcol
331331
publish_release: true
332332
keep_single_release: true

0 commit comments

Comments
 (0)