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

nixos/forgejo: changelog and migration instructions #267248

Merged
merged 9 commits into from
Nov 17, 2023

Conversation

bendlas
Copy link
Contributor

@bendlas bendlas commented Nov 13, 2023

Description of changes

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.11 Release Notes (or backporting 23.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@bendlas bendlas requested a review from emilylange as a code owner November 13, 2023 17:07
@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: documentation This PR adds or changes documentation 8.has: changelog 8.has: module (update) This PR changes an existing module in `nixos/` labels Nov 13, 2023
@bendlas
Copy link
Contributor Author

bendlas commented Nov 13, 2023

cc @schmittlauch as per #248310 (comment)

Copy link
Member

@schmittlauch schmittlauch left a comment

Choose a reason for hiding this comment

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

I haven't tried the migration steps myself so far (as I do not intend to upgrade my stable forgejo instance yet), but they look plausible to me. I added some possible improvements as comments.

As issue discussions often tend to focus more on complaining and nitpicking of negative things, I explicitly want to thank you for providing the upgrade instructions lacking in the last PR. Things are going well. 🤗

nixos/doc/manual/release-notes/rl-2311.section.md Outdated Show resolved Hide resolved
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Nov 13, 2023
@bendlas
Copy link
Contributor Author

bendlas commented Nov 13, 2023

I do not intend to upgrade my stable forgejo instance yet

Maybe I could interest you in verifying the instructions for running the forgejo module in gitea mode, that I added? Because I don't think I've got an instance with gitea module left 🙈

@schmittlauch
Copy link
Member

You might be lucky, I see what me and my btrfs snapshots can do this week ;)

Copy link
Member

@emilylange emilylange left a comment

Choose a reason for hiding this comment

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

You can test the change by building the manual yourself:

nix-build nixos/release.nix -A manual.x86_64-linux

nixos/doc/manual/release-notes/rl-2311.section.md Outdated Show resolved Hide resolved
nixos/modules/services/misc/forgejo.md Outdated Show resolved Hide resolved
bendlas and others added 3 commits November 15, 2023 14:21
as noted <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
@bendlas bendlas requested a review from emilylange November 15, 2023 13:40
@bendlas
Copy link
Contributor Author

bendlas commented Nov 17, 2023

Branch - off in 3 days, so last chance to review this ...

@bjornfor
Copy link
Contributor

I think 8 of 9 commits is a single logical change -- please squash?

@bendlas bendlas merged commit 20832d5 into NixOS:master Nov 17, 2023
@RaitoBezarius
Copy link
Member

@bendlas Please don't be so much in a hurry for such changes, we can always backport them, and they are not critical for branch-off. Leave the time to review them.

@bendlas
Copy link
Contributor Author

bendlas commented Nov 17, 2023

ok, sorry

@bendlas bendlas mentioned this pull request Nov 17, 2023
13 tasks
Copy link
Member

@schmittlauch schmittlauch left a comment

Choose a reason for hiding this comment

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

I successfully tested the migration by gitea-impersonation approach, it works like a charm.
As I made the error of running gitea on mariadb and renaming databases there is kind of a pain, I unfortunately could not verify the full migration instructions.

Apart from that I discovered a typo. I can of course submit a follow-up PR for this, but preferred to keep the review feedback tied to the original PR.

database.user = "gitea";
};

users.users,gitea = {
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
users.users,gitea = {
users.users.gitea = {

Copy link
Member

Choose a reason for hiding this comment

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

Ah, I see this has already been fixed in 8c441fc.


::: {.note}
Migrating is, while not strictly necessary at this point, highly recommended.
Both modules and projects are likely to divide further with each release.
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
Both modules and projects are likely to divide further with each release.
Both modules and projects are likely to diverge further with each release.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

please do create a new PR

Copy link
Member

Choose a reason for hiding this comment

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

I just did: #270256

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: changelog 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants