[chore] Align GoReleaser snapshot config (#1228)

* update snapshot version config

* update package tests to new package naming scheme

Author: mowies

.github/workflows/base-package-tests.yaml

@@ -35,7 +35,7 @@ jobs:
           name: linux-packages
 
       - name: Test ${{ matrix.type }} package
-        run: ./scripts/package-tests/package-tests.sh ./otelcol*-SNAPSHOT-*_linux_amd64.${{ matrix.type }} ${{ inputs.distribution }}
+        run: ./scripts/package-tests/package-tests.sh ./otelcol*-next_linux_amd64.${{ matrix.type }} ${{ inputs.distribution }}
 
   create-issue:
     name: Create GitHub Issue

cmd/builder/.goreleaser.yaml

@@ -52,7 +52,7 @@ archives:
   - formats:
       - binary
 snapshot:
-  version_template: '{{ .Tag }}-next'
+  version_template: '{{ incpatch .Version }}-next'
 checksum:
   name_template: checksums.txt
 dockers:

cmd/goreleaser/internal/configure.go

@@ -157,6 +157,7 @@ var (
 		WithDefaultPartial().
 		WithDefaultRelease().
 		WithNightlyConfig().
+		WithDefaultSnapshot().
 		Build()
 
 	// ebpf-profiler distro
@@ -183,6 +184,7 @@ var (
 		WithDefaultPartial().
 		WithDefaultRelease().
 		WithNightlyConfig().
+		WithDefaultSnapshot().
 		Build()
 
 	// OCB binary
@@ -456,6 +458,13 @@ func (b *distributionBuilder) WithDefaultBinaryChecksum() *distributionBuilder {
 	return b
 }
 
+func (b *distributionBuilder) WithDefaultSnapshot() *distributionBuilder {
+	b.dist.snapshot = config.Snapshot{
+		VersionTemplate: "{{ incpatch .Version }}-next",
+	}
+	return b
+}
+
 func (b *distributionBuilder) WithDefaultMonorepo() *distributionBuilder {
 	b.configFuncs = append(b.configFuncs, func(d *distribution) {
 		b.dist.monorepo = config.Monorepo{
@@ -544,6 +553,7 @@ func (b *distributionBuilder) binaryRelease(header string) config.Release {
 
 func (b *distributionBuilder) WithPackagingDefaults() *distributionBuilder {
 	return b.WithDefaultArchives().
+		WithDefaultSnapshot().
 		WithDefaultChecksum().
 		WithDefaultMonorepo().
 		WithDefaultEnv().
@@ -561,11 +571,9 @@ func (b *distributionBuilder) WithBinaryPackagingDefaults() *distributionBuilder
 	b.dist.changelog = config.Changelog{
 		Disable: "true",
 	}
-	b.dist.snapshot = config.Snapshot{
-		VersionTemplate: "{{ .Tag }}-next",
-	}
 
 	return b.WithBinArchive().
+		WithDefaultSnapshot().
 		WithDefaultChecksum().
 		WithDefaultEnv().
 		WithDefaultSigns().

cmd/opampsupervisor/.goreleaser.yaml

@@ -79,7 +79,7 @@ nfpms:
     description: OpenTelemetry Collector - opampsupervisor
     license: Apache 2.0
 snapshot:
-  version_template: '{{ .Tag }}-next'
+  version_template: '{{ incpatch .Version }}-next'
 checksum:
   name_template: checksums.txt
 dockers:

distributions/otelcol-contrib/.goreleaser.yaml

@@ -103,6 +103,8 @@ nfpms:
     maintainer: The OpenTelemetry Collector maintainers <[email protected]>
     description: OpenTelemetry Collector - otelcol-contrib
     license: Apache 2.0
+snapshot:
+  version_template: '{{ incpatch .Version }}-next'
 checksum:
   name_template: '{{ .ProjectName }}_otelcol-contrib{{ if eq .Runtime.Goos "windows" }}_{{ .Runtime.Goos }}{{ end }}_checksums.txt'
 dockers:

distributions/otelcol-ebpf-profiler/.goreleaser.yaml

@@ -29,6 +29,8 @@ archives:
     ids:
       - otelcol-ebpf-profiler-linux
     name_template: '{{ .Binary }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}{{ if .Mips }}_{{ .Mips }}{{ end }}'
+snapshot:
+  version_template: '{{ incpatch .Version }}-next'
 checksum:
   name_template: '{{ .ProjectName }}_otelcol-ebpf-profiler{{ if eq .Runtime.Goos "windows" }}_{{ .Runtime.Goos }}{{ end }}_checksums.txt'
 dockers:

distributions/otelcol-k8s/.goreleaser.yaml

@@ -44,6 +44,8 @@ archives:
       - otelcol-k8s-linux
       - otelcol-k8s-windows
     name_template: '{{ .Binary }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}{{ if .Mips }}_{{ .Mips }}{{ end }}'
+snapshot:
+  version_template: '{{ incpatch .Version }}-next'
 checksum:
   name_template: '{{ .ProjectName }}_otelcol-k8s{{ if eq .Runtime.Goos "windows" }}_{{ .Runtime.Goos }}{{ end }}_checksums.txt'
 dockers:

distributions/otelcol-otlp/.goreleaser.yaml

@@ -94,6 +94,8 @@ nfpms:
     maintainer: The OpenTelemetry Collector maintainers <[email protected]>
     description: OpenTelemetry Collector - otelcol-otlp
     license: Apache 2.0
+snapshot:
+  version_template: '{{ incpatch .Version }}-next'
 checksum:
   name_template: '{{ .ProjectName }}_otelcol-otlp{{ if eq .Runtime.Goos "windows" }}_{{ .Runtime.Goos }}{{ end }}_checksums.txt'
 dockers:

distributions/otelcol/.goreleaser.yaml

@@ -98,6 +98,8 @@ nfpms:
     maintainer: The OpenTelemetry Collector maintainers <[email protected]>
     description: OpenTelemetry Collector - otelcol
     license: Apache 2.0
+snapshot:
+  version_template: '{{ incpatch .Version }}-next'
 checksum:
   name_template: '{{ .ProjectName }}_otelcol{{ if eq .Runtime.Goos "windows" }}_{{ .Runtime.Goos }}{{ end }}_checksums.txt'
 dockers: