Skip to content

[25.05] merge in fc-24.11-dev (2025-05-21) #1496

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

Merged
merged 16 commits into from
May 22, 2025
Merged

Conversation

osnyx
Copy link
Member

@osnyx osnyx commented May 21, 2025

Manually resolved the ruff formatting change conflicts.

@flyingcircusio/release-managers

Security implications

  • Security requirements defined? (WHERE)
    • all changes here already went through a "security implications" review on their own, just testing the integration
  • Security requirements tested? (EVIDENCE)
    • automated tests still pass

nixpkgs-channel-update-tracker bot and others added 16 commits May 19, 2025 09:25
…4.11-dev/2025-05-19

[24.11] Automated nixpkgs update 2025-05-19
Perform an in-place restart of network-setup.service instead of a
stop+start to avoid machines
losing network connectivity due to dependent units being stopped
during switch-to-configuration.

The change is better placed in our nixpkgs fork than in fc-nixos.

PL-133570
…ation-2411

[24.11] network: move network-setup resstart to nixpkgs
isort due to a bug (PyCQA/isort#1889)
is giving us different results between CLI/Github Actions and the
pre-commit hook.

Switching all linting and formatting to ruff gets us back to a stable
situation.
includes some manual adjustments of "fmt: skip" and "fmt: on/off"
directives to account for slight differences between black and ruff.
Switch formatter to ruff because isort is having stability issues.
Our interactive tooling `fc-manage switch -s "somespecialisation"` also
supports switching to a new system on a certain specialisation. The
reboot detection shall only trigger for numeric release changes for
these cases as well.
Necessary for properly comparing different specialisations within the
same NixOS release series.
Do not use complicated parsing in `nixos-version` but leverage the
standardizes `os-release` format.
…edule-on-specialisation

agent: fix accidental immediate reboots on hosts that use specialisat…
Follow up to e7312af. Moving the code
to a src subdirectory broke the coverage generation.
A missing `htmlcov` directory in the build broke the whole Nix build.
@osnyx
Copy link
Member Author

osnyx commented May 22, 2025

Let's keep an eye on whether 51d0721 needs to be backported to fc-24.11-dev as well.
If it is necessary there as well, I honestly don't know how fc-agent builds had ever passed there, so I'll wait until we see failures there.

@osnyx osnyx merged commit 4c409e3 into fc-25.05-dev May 22, 2025
2 of 4 checks passed
@osnyx osnyx deleted the 2411-merge-2025-05-21 branch May 22, 2025 10:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants