From 05a2844bdb4f4483efed9eca9c3d6e54c859ebaa Mon Sep 17 00:00:00 2001 From: Daniel Jaglowski Date: Thu, 20 Jun 2024 04:45:23 -0500 Subject: [PATCH] Docs - Update contrib release step 1 (#10439) When I performed this step yesterday, I found that it was necessary to update the builder configs first, otherwise `make update-otel` would fail. This PR just updates the order of operations to match what worked for me. --- docs/release.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/release.md b/docs/release.md index e14058ed733..bba9ef21777 100644 --- a/docs/release.md +++ b/docs/release.md @@ -53,11 +53,13 @@ It is possible that a core approver isn't a contrib approver. In that case, the ## Releasing opentelemetry-collector-contrib 1. Open a PR to Contrib to use the newly released Core version and set it to Ready for Review. - - Run `make update-otel OTEL_VERSION=v0.85.0 OTEL_STABLE_VERSION=v1.1.0` - Manually update `cmd/otelcontribcol/builder-config.yaml` - Manually update `cmd/oteltestbedcol/builder-config.yaml` - - Run `make genotelcontribcol` - - Push updates to the PR + - Run `make genotelcontribcol genoteltestbedcol` + - Commit the changes + - Run `make update-otel OTEL_VERSION=v0.85.0 OTEL_STABLE_VERSION=v1.1.0` + - Commit the changes + - Open a PR - 🛑 **Do not move forward until this PR is merged.** 🛑 2. Manually run the action [Automation - Prepare Release](https://github.com/open-telemetry/opentelemetry-collector-contrib/actions/workflows/prepare-release.yml). When prompted, enter the version numbers determined in Step 1, but do not include a leading `v`. This action will create a pull request to update the changelog and version numbers in the repo. **While this PR is open all merging in Contrib should be halted**.