polishing

Signed-off-by: Moritz Wiesinger <[email protected]>

Author: mowies

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

@@ -77,12 +77,14 @@ jobs:
           run_id=$(gh run list --branch main --workflow build-and-test --repo open-telemetry/opentelemetry-collector-contrib --limit 1 --status success --json databaseId --jq '.[0].databaseId')
           echo "run_id=$run_id" >> "$GITHUB_OUTPUT"
 
-      - run: mkdir -p distributions/otelcol-contrib/artifacts
+      - name: Create artifacts directory to store prebuilt artifacts
+        run: mkdir -p distributions/otelcol-contrib/artifacts
 
-      - run: mkdir -p distributions/otelcol-contrib/artifacts/otelcol-contrib_linux_amd64_v1
+      - name: Create sub-directory for otelcol-contrib nightly build
         if: ${{ inputs.distribution == 'otelcol-contrib' && inputs.latest == true }}
+        run: mkdir -p distributions/otelcol-contrib/artifacts/otelcol-contrib_linux_amd64_v1
 
-      - name: Download built otelcontribcol artifact from contrib repo
+      - name: Download built otelcol-contrib artifact from contrib repo
         if: inputs.latest == true
         uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
         with:
@@ -91,7 +93,7 @@ jobs:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           run-id: ${{ steps.get-run-id.outputs.run_id }}
 
-      - name: Rename downloaded artifact
+      - name: Move downloaded artifact
         if: inputs.latest == true
         run: mv otelcontribcol_linux_amd64 distributions/otelcol-contrib/artifacts/otelcol-contrib_linux_amd64_v1/otelcol-contrib
 
@@ -119,8 +121,8 @@ jobs:
       - if: ${{ inputs.distribution == 'otelcol-contrib' && inputs.latest != true }}
         run: mv distributions/otelcol-contrib/dist/**/* distributions/otelcol-contrib/artifacts/
 
-      - run: ls -laR distributions/otelcol-contrib/artifacts
-        if: ${{ inputs.distribution == 'otelcol-contrib' }}
+      - if: ${{ inputs.distribution == 'otelcol-contrib' }}
+        run: ls -laR distributions/otelcol-contrib/artifacts
 
       - name: Run GoReleaser for ${{ inputs.distribution }}
         uses: goreleaser/goreleaser-action@9ed2f89a662bf1735a48bc8557fd212fa902bebf # v6.1.0

Makefile

@@ -5,7 +5,7 @@ OTELCOL_BUILDER_VERSION ?= 0.114.0
 OTELCOL_BUILDER_DIR ?= ${HOME}/bin
 OTELCOL_BUILDER ?= ${OTELCOL_BUILDER_DIR}/ocb
 
-DISTRIBUTIONS ?= "otelcol-contrib"
+DISTRIBUTIONS ?= "otelcol,otelcol-contrib,otelcol-k8s,otelcol-otlp"
 
 ci: check build
 check: ensure-goreleaser-up-to-date

cmd/goreleaser/internal/configure.go

@@ -60,14 +60,14 @@ func GenerateContribBuildOnly(dist string, buildOrRest bool) config.Project {
 	}
 }
 
-func Generate(dist string, split bool) config.Project {
+func Generate(dist string, buildOrRest bool) config.Project {
 	return config.Project{
 		ProjectName: "opentelemetry-collector-releases",
 		Checksum: config.Checksum{
 			NameTemplate: fmt.Sprintf("{{ .ProjectName }}_%v_checksums.txt", dist),
 		},
 		Env:             []string{"COSIGN_YES=true"},
-		Builds:          Builds(dist, split),
+		Builds:          Builds(dist, buildOrRest),
 		Archives:        Archives(dist),
 		MSI:             WinPackages(dist),
 		NFPMs:           Packages(dist),