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
treewide: update 21.03 to 21.05 #108899
treewide: update 21.03 to 21.05 #108899
Conversation
Note: this will break inflight PRs which add things to the release notes for 21.05, since this renames the release notes file to match the new version. |
partial overlap with #107565 |
Hrm, should I just drop this PR entirely in favour of that one? |
In any case, I realised I forgot the EOL date update on the 21.05 release notes, so updated that now too. |
@ofborg eval |
Not that this can be done in a PR, but we should rename the 21.03 milestone to 21.05 as well. |
OK, I did that immediately in this repo, so that we don't forget. |
I also went ahead and did the same for the org project (https://github.com/orgs/NixOS/projects/6). |
877e429
to
6340c4b
Compare
Rebased again to remove merge conflict. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Those are intentionally as is: they're comparing stateVersion, so to avoid breaking existing configs (generated with stateVersion = "21.03") they should remain as is, I think. |
We need to add 21.05 there additionally, considering 21.03 as a past release, but I don't much about stateVersion though. |
These two are both relative comparisons rather than exact comparisons. For the Nextcloud one: there's no nextcloud21 release yet, so nextcloud20 should be the shipped release with stateVersion==21.03 and stateVersion==21.05. |
https://gitlab.com/libosinfo/osinfo-db/-/merge_requests/263 has been merged, I think we are good to merge this now |
Agreed |
I'm still unconvinced in those two specific cases:
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Diff LGTM as well.
f9bd2f6
to
94a54af
Compare
if you rebase the conflicts, I will merge. Sorry for neglecting this |
The NixOS 21.03 release has been delayed to 21.05. See NixOS/rfcs#80. There are two instances of 21.03 which have been left as is, since they are in stateVersion comparisons. This will ensure that existing user configurations which refer to 21.03 will continue to work.
94a54af
to
1d815b6
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
diff LGTM
thank you @lukegb, sorry this got postponed longer than it needed to :) |
The NixOS 21.03 release has been delayed to 21.05. See NixOS/rfcs#80.
There are two instances of 21.03 which have been left as is, since they
are in stateVersion comparisons. This will ensure that existing user
configurations which refer to 21.03 will continue to work.
cc @jonringer @FRidh