Skip to content

Commit

Permalink
Docs - Update contrib release step 1 (open-telemetry#10439)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
djaglowski authored Jun 20, 2024
1 parent 149ded2 commit 05a2844
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions docs/release.md
Original file line number Diff line number Diff line change
Expand Up @@ -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**.
Expand Down

0 comments on commit 05a2844

Please sign in to comment.