From 86bc0dfc1f7128dd45f08cf0d84295f8dfda4403 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <motiejus@jakstys.lt>
Date: Mon, 26 Feb 2024 07:57:16 +0200
Subject: [PATCH] deployerbot: fixes

---
 modules/services/deployerbot/default.nix | 38 +++++++++++++-----------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/modules/services/deployerbot/default.nix b/modules/services/deployerbot/default.nix
index 9a1d4e4..665daae 100644
--- a/modules/services/deployerbot/default.nix
+++ b/modules/services/deployerbot/default.nix
@@ -3,22 +3,7 @@
   lib,
   pkgs,
   ...
-}: let
-  mkOptional = {
-    derivationTarget,
-    pingTarget,
-  }: ''
-    if ${pkgs.inetutils}/bin/ping -c 1 ${pingTarget}; then
-      ${pkgs.deploy-rs.deploy-rs}/bin/deploy \
-        --ssh-opts="-i ''${CREDENTIALS_DIRECTORY}/ssh-key" \
-        --ssh-user=deployerbot-follower \
-        --confirm-timeout 60 \
-        --skip-checks \
-        --targets ${derivationTarget} -- \
-          --accept-flake-config || EXITCODE=1
-    fi
-  '';
-in {
+}: {
   options.mj.services.deployerbot.main = with lib.types; {
     enable = lib.mkEnableOption "Enable system updater orchestrator";
     deployDerivations = lib.mkOption {type = listOf str;};
@@ -88,7 +73,6 @@ in {
             nix flake update --accept-flake-config --commit-lock-file
             # TODO --all-systems
             nix flake check --accept-flake-config
-            git push origin main
 
             EXITCODE=0
             ${pkgs.deploy-rs.deploy-rs}/bin/deploy \
@@ -99,8 +83,26 @@ in {
               --targets ${deployDerivationsStr} -- \
                 --accept-flake-config || EXITCODE=1
 
+            if [[ $EXITCODE != 0 ]]; then
+              git push origin main
+            fi
+
             # Optional deployments
-            ${lib.concatLines (map mkOptional cfg.deployIfPresent)}
+            ${lib.concatLines (map ({
+                derivationTarget,
+                pingTarget,
+              }: ''
+                if ${pkgs.inetutils}/bin/ping -c 1 ${pingTarget}; then
+                  ${pkgs.deploy-rs.deploy-rs}/bin/deploy \
+                    --ssh-opts="-i ''${CREDENTIALS_DIRECTORY}/ssh-key" \
+                    --ssh-user=deployerbot-follower \
+                    --confirm-timeout 60 \
+                    --skip-checks \
+                    --targets ${derivationTarget} -- \
+                      --accept-flake-config || EXITCODE=1
+                fi
+              '')
+              cfg.deployIfPresent)}
 
             exit $EXITCODE
           '';