another try to fix CI

chatmail · Jul 8, 2024 · 401c24d · 401c24d
1 parent 4050c5c
commit 401c24d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/cmdeploy/src/cmdeploy/cmdeploy.py b/cmdeploy/src/cmdeploy/cmdeploy.py
@@ -65,8 +65,9 @@ def run_cmd(args, out):
     if retcode == 0:
         out.green("Deploy completed, call `cmdeploy test` next.")
     elif not remote_data["acme_account_url"]:
-        out("Deploy completed but letsencrypt not configured, re-checking DNS")
-        return dns_cmd(args, out)
+        out.red("Deploy completed but letsencrypt not configured")
+        out.red("Run 'cmdeploy dns' or 'cmdeploy run' again")
+        retcode = 0
     else:
         out.red("Deploy failed")
     return retcode

diff --git a/cmdeploy/src/cmdeploy/remote_funcs.py b/cmdeploy/src/cmdeploy/remote_funcs.py
@@ -34,7 +34,7 @@ def perform_initial_checks(mail_domain):
 
     res["acme_account_url"] = shell("acmetool account-url", fail_ok=True)
     shell("apt-get install -y dnsutils")
-    shell("unbound-control flush_zone {mail_domain}", fail_ok=True)
+    shell(f"unbound-control flush_zone {mail_domain}", fail_ok=True)
 
     res["dkim_entry"] = get_dkim_entry(mail_domain, dkim_selector="opendkim")