Skip to content

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

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.

Sign up for GitHub

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
genebean merged 2 commits into from
Jul 21, 2026
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a9238c0
feat: add deploy-with-retry to survive sshd bouncing mid-deploy
genebean Jul 21, 2026
2608eb8
Ran nix flake update
genebean Jul 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 34 additions & 34 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion pkgs/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
{ inputs, pkgs }:
let
deploy-with-retry = pkgs.callPackage ./deploy-with-retry { inherit inputs; };
nixdiff = pkgs.callPackage ./nixdiff { };
rpi4-installer = pkgs.callPackage ./rpi4-installer { inherit inputs; };
in
{
inherit nixdiff rpi4-installer;
inherit deploy-with-retry nixdiff rpi4-installer;
default = nixdiff;
}
55 changes: 55 additions & 0 deletions pkgs/deploy-with-retry/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
{ pkgs, inputs }:
let
deploy-rs = inputs.deploy-rs.packages.${pkgs.system}.deploy-rs;
in
pkgs.writeShellApplication {
name = "deploy-with-retry";
runtimeInputs = [
deploy-rs
pkgs.nix
pkgs.openssh
];
text = ''
target="''${1:?usage: deploy-with-retry .#hostname [extra deploy-rs args...]}"
shift

if [[ "$target" == *#* ]]; then
flake_ref="''${target%%#*}"
node="''${target##*#}"
else
flake_ref="."
node="$target"
fi
[ -z "$flake_ref" ] && flake_ref="."

for attempt in 1 2; do
echo "deploy-rs attempt $attempt/2"

if deploy "$target" "$@"; then
exit 0
fi

if [[ "$attempt" == 2 ]]; then
exit 1
fi

# Reconnect as the same ssh_user/hostname deploy-rs itself resolved
# for this node (lib/mkDeployNode.nix), not whoever the local shell
# user happens to be - those can differ per node (e.g. mightymac
# uses "gene.liverman", everything else defaults to "gene").
ssh_user=$(nix eval --raw "$flake_ref#deploy.nodes.\"$node\".sshUser")
ssh_host=$(nix eval --raw "$flake_ref#deploy.nodes.\"$node\".hostname")

echo "Waiting for SSH on $ssh_user@$ssh_host..."

until ssh \
-o BatchMode=yes \
-o ConnectTimeout=5 \
-o ConnectionAttempts=1 \
"$ssh_user@$ssh_host" true 2>/dev/null
do
sleep 2
done
done
'';
}
Loading