Skip to content

Commit a17e8a3

Browse files
committed
update release docs
1 parent 499806b commit a17e8a3

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

docs/release.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,26 +11,27 @@ For general information about all Collector repositories release procedures, see
1111
0. Ensure that the [opentelemetry-collector][1] and [opentelemetry-collector-contrib][2] release procedures have been followed and a new
1212
opentelemetry-collector and opentelemetry-collector-contrib version have been released. The opentelemetry-collector-releases release
1313
should be done after both of these releases.
14-
1. Run the GitHub Action workflow "[Update Version in Distributions and Prepare PR](https://github.com/open-telemetry/opentelemetry-collector-releases/actions/workflows/update-version.yaml)" which will update the minor version automatically (e.g. v0.116.0 -> v0.117.0) or manually provide a new version if releasing a bugfix or skipping a version. Select "create pr" option.
14+
1. Review and merge the 2 Renovate PRs for core and contrib components.
15+
2. Run the GitHub Action workflow "[Update Version in Distributions and Prepare PR](https://github.com/open-telemetry/opentelemetry-collector-releases/actions/workflows/update-version.yaml)" which will update the minor version automatically (e.g. v0.116.0 -> v0.117.0) or manually provide a new version if releasing a bugfix or skipping a version. Select "create pr" option.
1516
The PR needs to be manually closed and re-opened once to trigger pipelines.
1617
- 🛑 **Do not move forward until this PR is merged.** 🛑
17-
2. Check out main and ensure it has the "Update version from ..." commit in your local
18+
3. Check out main and ensure it has the "Update version from ..." commit in your local
1819
copy by pulling in the latest from
1920
`open-telemetry/opentelemetry-collector-releases`. Assuming your upstream
2021
remote is named `upstream`, you can try running:
2122
- `git checkout main && git fetch upstream && git rebase upstream/main`
22-
3. Create a tag for the new release version by running:
23+
4. Create a tag for the new release version by running:
2324

2425
⚠️ If you set your remote using `https` you need to include `REMOTE=https://github.com/open-telemetry/opentelemetry-collector-releases.git` in each command. ⚠️
2526

2627
- `make push-tags TAG=v0.85.0`
27-
4. Wait for the new tag build to pass successfully.
28-
5. Ensure the "Release Core", "Release Contrib", "Release k8s", "Release OTLP", "Release Builder" and "Release OpAMP Suporvisor" actions pass, this will
28+
5. Wait for the new tag build to pass successfully.
29+
6. Ensure the "Release Core", "Release Contrib", "Release k8s", "Release OTLP", "Release Builder" and "Release OpAMP Suporvisor" actions pass, this will
2930
1. push new container images to `https://hub.docker.com/repository/docker/otel/opentelemetry-collector`, `https://hub.docker.com/repository/docker/otel/opentelemetry-collector-contrib` and `https://hub.docker.com/repository/docker/otel/opentelemetry-collector-k8s` as well as their respective counterparts on GHCR
3031
2. create a Github release for the tag and push all the build artifacts to the Github release. See [example](https://github.com/open-telemetry/opentelemetry-collector-releases/actions/workflows/release-core.yaml).
3132
3. build and release ocb and opampsupervisor binaries under a separate tagged Github release, e.g. `cmd/{builder,opampsupervisor}/v0.85.0`
3233
4. build and push ocb and opampsupervisor Docker images to `https://hub.docker.com/r/otel/opentelemetry-collector-builder` and the GitHub Container Registry within the releases repository (and opampsupervisor respectively)
33-
6. Update the release notes with the CHANGELOG.md updates.
34+
7. Update the release notes with the CHANGELOG.md updates.
3435

3536
## Post-release steps
3637

0 commit comments

Comments
 (0)