Skip to content

Commit

Permalink
[chore][release.md] checkout release branch to the correct commit & u…
Browse files Browse the repository at this point in the history
…pdate release schedule (#11938)

#### Description
If more PRs are merged after the release PR commit, make sure to
checkout the release branch to the release PR commit rather than the
mainline head.
  • Loading branch information
songy23 authored Dec 23, 2024
1 parent 84fe00d commit c1e860e
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions docs/release.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ Before the release, make sure there are no open release blockers in [core](https
`open-telemetry/opentelemetry-collector`. Assuming your upstream remote is
named `upstream`, you can try the following commands:
- `git checkout main && git fetch upstream && git rebase upstream/main`
- `git switch -c release/<release series>`
- `git switch -c release/<release series>` # append the commit hash of the PR in the last step if it is not the head of mainline
- `git push -u upstream release/<release series>`

5. Make sure you are on `release/<release-series>`. Tag the module groups with the new release version by running:
Expand Down Expand Up @@ -90,7 +90,7 @@ Before the release, make sure there are no open release blockers in [core](https
new branch to `open-telemetry/opentelemetry-collector-contrib`. Assuming your
upstream remote is named `upstream`, you can try the following commands:
- `git checkout main && git fetch upstream && git rebase upstream/main`
- `git switch -c release/<release series>`
- `git switch -c release/<release series>` # append the commit hash of the PR in the last step if it is not the head of mainline
- `git push -u upstream release/<release series>`

4. Make sure you are on `release/<release-series>`. Tag all the module groups with the new release version by running:
Expand Down Expand Up @@ -234,8 +234,6 @@ Once a module is ready to be released under the `1.x` version scheme, file a PR

| Date | Version | Release manager |
|------------|----------|---------------------------------------------------|
| 2024-12-02 | v0.115.0 | [@atoulme](https://github.com/atoulme) |
| 2024-12-16 | v0.116.0 | [@songy23](https://github.com/songy23) |
| 2025-01-06 | v0.117.0 | [@dmitryax](https://github.com/dmitryax) |
| 2025-01-20 | v0.118.0 | [@codeboten](https://github.com/codeboten) |
| 2025-02-03 | v0.119.0 | [@bogdandrutu](https://github.com/bogdandrutu) |
Expand All @@ -244,3 +242,5 @@ Once a module is ready to be released under the `1.x` version scheme, file a PR
| 2025-03-17 | v0.122.0 | [@evan-bradley](https://github.com/evan-bradley) |
| 2025-03-31 | v0.123.0 | [@djaglowski](https://github.com/djaglowski) |
| 2025-04-14 | v0.124.0 | [@TylerHelmuth](https://github.com/TylerHelmuth) |
| 2025-04-28 | v0.125.0 | [@atoulme](https://github.com/atoulme) |
| 2025-05-12 | v0.126.0 | [@songy23](https://github.com/songy23) |

0 comments on commit c1e860e

Please sign in to comment.