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-nixpkgs: update for the new fc-release-tools versions #1207

Open
wants to merge 1 commit into
base: fc-24.05-dev
Choose a base branch
from

Conversation

leona-ya
Copy link
Member

@leona-ya leona-ya commented Dec 18, 2024

This version sends matrix notifications on graceful failures and hard-resets nixpkgs with a safety belt instead of rebasing. This fixes the problems when a manual rebase conflict resolution is required.

PL-133100

Note

Requires flyingcircusio/fc-nixos-release-tools#3

Requires MATRIX_HOOKSHOT_URL in secrets to be set.

@flyingcircusio/release-managers

Release process

  • Created changelog entry using ./changelog.sh

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)
    • Should work in these scenarios:
      • Normal: No merge conflict, straight forward rebase
      • Conflict: Send notification, don't create PR
      • Moved nixpkgs while PR open: reject hard-rebase
  • Security requirements tested? (EVIDENCE)
    • Tested in fc-nixos-testing

This version sends matrix notifications on graceful failures and hard-resets
nixpkgs with a safety belt instead of rebasing. This fixes the problems
when a manual rebase conflict resolution is required.

PL-133100
@leona-ya leona-ya force-pushed the PL-133100-nixpkgs-updates-hookshot-hard-reset branch from aa74b6c to 65f045a Compare December 18, 2024 21:06
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.

1 participant