Skip to content

Commit 05a2844

Browse files
authored
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.
1 parent 149ded2 commit 05a2844

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

docs/release.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,13 @@ It is possible that a core approver isn't a contrib approver. In that case, the
5353
## Releasing opentelemetry-collector-contrib
5454

5555
1. Open a PR to Contrib to use the newly released Core version and set it to Ready for Review.
56-
- Run `make update-otel OTEL_VERSION=v0.85.0 OTEL_STABLE_VERSION=v1.1.0`
5756
- Manually update `cmd/otelcontribcol/builder-config.yaml`
5857
- Manually update `cmd/oteltestbedcol/builder-config.yaml`
59-
- Run `make genotelcontribcol`
60-
- Push updates to the PR
58+
- Run `make genotelcontribcol genoteltestbedcol`
59+
- Commit the changes
60+
- Run `make update-otel OTEL_VERSION=v0.85.0 OTEL_STABLE_VERSION=v1.1.0`
61+
- Commit the changes
62+
- Open a PR
6163
- 🛑 **Do not move forward until this PR is merged.** 🛑
6264

6365
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**.

0 commit comments

Comments
 (0)