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

Sync Flake to lock file, update nixos-mailserver #1050

Merged
merged 1 commit into from
Jul 5, 2024

Conversation

dpausp
Copy link
Member

@dpausp dpausp commented Jul 4, 2024

The lock file was correct but rebasing on the last 23.11 release introduced overrides that are wrong for 24.05. This pins devenv to the version expected in the lock file and uses the versioned nixos-mailserver branch instead of master.

Moreover, nixos-mailserver got rebased on the current upstream state for 24.05.

PL-132776

@flyingcircusio/release-managers

Release process

Impact:

Changelog:

(internal)

PR release workflow (internal)

  • PR has internal ticket
  • internal issue ID (PL-…) part of branch name
  • internal issue ID mentioned in PR description text
  • ticket is on Platform agile board
  • ticket state set to Pull request ready
  • if ticket is more urgent than within the next few days, directly contact a member of the Platform team

Design notes

  • Provide a feature toggle if the change might need to be adjusted/reverted quickly depending on context. Consider whether the default should be on or off. Example: rate limiting.
  • All customer-facing features and (NixOS) options need to be discoverable from documentation. Add or update relevant documentation such that hosted and guided customers can understand it as well.

Security implications

  • Security requirements defined? (WHERE)
    • make sure correct Flake inputs are used for dev purposes (devenv) and for generating versions.json (nixos-mailserver) by using versioned branches and pinning.
  • Security requirements tested? (EVIDENCE)
    • nix flake lock produces the expected output, mail test still works

The lock file was correct but rebasing on the last 23.11 release
introduced overrides that are wrong for 24.05. This pins devenv
to the version expected in the lock file and uses the versioned
nixos-mailserver branch instead of master.

Moreover, nixos-mailserver got rebased on the current upstream state for
24.05.

PL-132776
@dpausp dpausp marked this pull request as ready for review July 4, 2024 15:48
@ctheune ctheune merged commit deb7e03 into fc-24.05-dev Jul 5, 2024
2 checks passed
@ctheune ctheune deleted the PL-132776-fix-lock-file-update-mailserver branch July 5, 2024 11:27
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.

2 participants