Skip to content

Commit

Permalink
Apply suggestions from code review
Browse files Browse the repository at this point in the history
Co-authored-by: Jon Kartago Lamida <[email protected]>
  • Loading branch information
narqo and lamida authored Oct 14, 2024
1 parent cc359c8 commit a7557f1
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ If something is not clear, you can get back to this document to learn more about
```bash
./tools/release/create-pr-to-merge-release-branch-to-main.sh
```
This prepares a PR into `main` branch. On approval, **use** the `merge-approved-pr-branch-to-main.sh` script, following the [instrictions](https://github.com/grafana/mimir/blob/main/RELEASE.md#merging-release-branch-into-main) on how to merge the PR with "Merge commit" (i.e. we DO NOT "Squash and merge" this one).
This prepares a PR into `main` branch. On approval, **use** the `merge-approved-pr-branch-to-main.sh` script, following the [instruction](https://github.com/grafana/mimir/blob/main/RELEASE.md#merging-release-branch-into-main) on how to merge the PR with "Merge commit" (i.e. we DO NOT "Squash and merge" this one).
- [ ] Publish the Github pre-release draft after getting review from at least one maintainer
- [ ] Announce the release candidate on social media such as on Mimir community slack using your own Twitter, Mastodon or LinkedIn account
- [ ] Vendor the release commit of Mimir into Grafana Enterprise Metrics (GEM)
Expand Down Expand Up @@ -139,7 +139,7 @@ If something is not clear, you can get back to this document to learn more about
```bash
./tools/release/create-pr-to-merge-release-branch-to-main.sh
```
This prepares a PR into `main` branch. On approval, **use** the `merge-approved-pr-branch-to-main.sh` script, following the [instrictions](https://github.com/grafana/mimir/blob/main/RELEASE.md#merging-release-branch-into-main) on how to merge the PR with "Merge commit" (i.e. we DO NOT "Squash and merge" this one).
This prepares a PR into `main` branch. On approval, **use** the `merge-approved-pr-branch-to-main.sh` script, following the [instruction](https://github.com/grafana/mimir/blob/main/RELEASE.md#merging-release-branch-into-main) on how to merge the PR with "Merge commit" (i.e. we DO NOT "Squash and merge" this one).
- [ ] If during the release process settings in the `renovate.json5` have been modified in such a way that dependency updates maintain more than the latest two minor versions,
modify it again to ensure that only the latest two minor versions get updated.
For instance, if versions 3.1, 3.0 and 2.10 are configured in `renovate.json5`, `renovate.json5` should keep updated the following branches:
Expand Down
2 changes: 1 addition & 1 deletion operations/helm/charts/mimir-distributed/RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ The [release process](https://github.com/grafana/mimir/blob/main/.github/workflo

- Update and finalize the release notes in `docs/sources/helm-charts/mimir-distributed/release-notes` directory if there has been some changes after release candidate.

- Finalize the chart's changelog. Update the title of the release section, setting it to the final release version number.
- Finalize the chart's changelog. Update the title of the release section by setting it to the final release version number.
For example, `## 4.5.0`.
Expand Down

0 comments on commit a7557f1

Please sign in to comment.