From e23c9d0a01834a64162acb1677b7d69aa5be46f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juraci=20Paix=C3=A3o=20Kr=C3=B6hling?= Date: Wed, 17 Nov 2021 21:32:39 +0100 Subject: [PATCH] Include local builder config to release procedure (#4446) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #4445 Signed-off-by: Juraci Paixão Kröhling --- docs/release.md | 1 + internal/buildscripts/builder-config.yaml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/release.md b/docs/release.md index 088fdad811c..bd85b677e32 100644 --- a/docs/release.md +++ b/docs/release.md @@ -23,6 +23,7 @@ We release both core and contrib collectors with the same versions where the con * Update [versions.yaml](https://github.com/open-telemetry/opentelemetry-collector/blob/main/versions.yaml) * Run `make multimod-prerelease` * Update the collector version in the collector builder to the new release in `./cmd/builder/internal/builder/config.go`. + * Update the collector version in the manifest used by `make run` to the new release in `./internal/buildscripts/builder-config.yaml`. 1. Make sure the current main branch build successfully passes (Core and Contrib). For Contrib also check that the spawn-stability-tests-job triggered by the main build-publish job also passes. Check that the corresponding "-dev" images exist in Dockerhub (Core and Contrib). diff --git a/internal/buildscripts/builder-config.yaml b/internal/buildscripts/builder-config.yaml index abf1d9f1d7b..27073dda7fa 100644 --- a/internal/buildscripts/builder-config.yaml +++ b/internal/buildscripts/builder-config.yaml @@ -2,8 +2,8 @@ dist: module: github.com/open-telemetry/opentelemetry-collector-releases/core name: cmd-otelcol description: OpenTelemetry Collector Replacing cmd/otelcol - version: 0.38.0-dev - otelcol_version: 0.38.0 + version: 0.39.0-dev + otelcol_version: 0.39.0 replaces: - go.opentelemetry.io/collector => ../