Skip to content

Update flake inputs; add deploy-with-retry helper#702

Merged
genebean merged 2 commits into
mainfrom
nix-flake-update
Jul 21, 2026
Merged

Update flake inputs; add deploy-with-retry helper#702
genebean merged 2 commits into
mainfrom
nix-flake-update

Conversation

@genebean

Copy link
Copy Markdown
Owner

Summary

  • Ran nix flake update to bump flake inputs.
  • Added deploy-with-retry (pkgs/deploy-with-retry): wraps nix run .#deploy-rs and retries once, polling SSH (as the same ssh_user/hostname deploy-rs resolves for the target node) before retrying, since deploy-rs itself has no retry logic and can spuriously roll back a successful deploy if sshd.service bounces mid-activation.

Test plan

  • nix build .#deploy-with-retry builds and passes writeShellApplication's shellcheck
  • nix eval confirms deploy.nodes."hetznix01".sshUser/.hostname and deploy.nodes."mightymac".sshUser resolve correctly
  • Exercise a real deploy that hits the sshd-restart race to confirm the retry recovers

🤖 Generated with Claude Code

genebean and others added 2 commits July 20, 2026 21:19
deploy-rs has no retry logic (confirmed in its source) - a single ssh
connection drop during activation (e.g. sshd.service restarting as
part of the switch) makes it roll back even though the switch itself
succeeded. This wraps `deploy` and, on failure, polls SSH using the
same ssh_user/hostname deploy-rs resolves for that node before
retrying once.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
@genebean
genebean enabled auto-merge July 21, 2026 01:21
@genebean
genebean merged commit 6c59d14 into main Jul 21, 2026
2 checks passed
@genebean
genebean deleted the nix-flake-update branch July 21, 2026 01:22
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