Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update the release version in CHANGELOG.md and VERSION #7599

Merged
merged 1 commit into from
Mar 12, 2024

Conversation

duricanikolic
Copy link
Contributor

@duricanikolic duricanikolic commented Mar 12, 2024

What this PR does

This PR makes the following changes:

  • sets the current version in CHANGELOG.md to 2.12.0-rc.0.
  • sets the current version in VERSION to 2.12.0-rc.0.

Which issue(s) this PR fixes or relates to

Part of #7542

Checklist

  • Tests updated.
  • Documentation added.
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX].
  • about-versioning.md updated with experimental features.

@duricanikolic duricanikolic added the release Release process label Mar 12, 2024
@duricanikolic duricanikolic self-assigned this Mar 12, 2024
@duricanikolic duricanikolic requested a review from a team as a code owner March 12, 2024 10:56
renovate.json Outdated
@@ -3,15 +3,15 @@
"extends": [
"config:base"
],
"baseBranches": ["main", "release-2.11", "release-2.10"],
"baseBranches": ["main", "release-2.12", "release-2.11"],
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does renovate look at this file on the branch?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not sure. But it is better to keep this one up-to-date too, at least for completeness.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I disagree. I find it confusing to make unnecessary changes. If we want to include new branch, we should do it in file that's actually used.

Furthermore if we merge this branch into main after creating rc-0, we will effectively stop getting updates for release-2.10, even though release-2.12 wasn't released yet.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Renovate always uses the config from the repository's default branch

https://docs.renovatebot.com/configuration-options/

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have removed the changes I previously did in renovate.json, and I will now merge this PR.

Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com>
@duricanikolic duricanikolic changed the title Update the release version in CHANGELOG.md, VERSION and renovate.json Update the release version in CHANGELOG.md and VERSION Mar 12, 2024
@duricanikolic duricanikolic merged commit 58c5476 into release-2.12 Mar 12, 2024
29 checks passed
@duricanikolic duricanikolic deleted the yuri/release-2.12 branch March 12, 2024 12:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release Release process
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants