From d369e05082626d537f92b8a7d7b459bfa9223861 Mon Sep 17 00:00:00 2001 From: Alya Sirko Date: Sat, 10 Sep 2022 16:14:53 +0300 Subject: [PATCH] try to fix gitea deploy --- ci.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/ci.py b/ci.py index 9ed728cc..2f3aaea9 100755 --- a/ci.py +++ b/ci.py @@ -85,11 +85,12 @@ def deploy_gitea_release(): "--asset", f"{HOST_MOUNTED_VOLUME}/{APP_NAME}-{APP_SEMVER}.tar.zstd"]) def deploy_fdroid_repo(): - subprocess.run(["eval $(ssh-agent -s)"], shell=True) - subprocess.run(["echo \"$SSH_PRIVATE_KEY\" | tr -d '\r' | ssh-add -"], shell=True) - subprocess.run(["scp", "-oStrictHostKeyChecking=no", "-oUserKnownHostsFile=/dev/null", - "-r", f"{HOST_HOME}/fdroid/repo/*", - "deployer@selfprivacy.org:/var/www/fdroid.selfprivacy.org"]) +# subprocess.run(["eval $(ssh-agent -s)"], shell=True) +# subprocess.run(["echo \"$SSH_PRIVATE_KEY\" | tr -d '\r' | ssh-add -"], shell=True) +# subprocess.run(["scp", "-oStrictHostKeyChecking=no", "-oUserKnownHostsFile=/dev/null", +# "-r", f"{HOST_HOME}/fdroid/repo/*", +# "deployer@selfprivacy.org:/var/www/fdroid.selfprivacy.org"]) + subprocess.run([f"eval $(ssh-agent -s) && echo \"$SSH_PRIVATE_KEY\" | tr -d '\r' | ssh-add - && scp -oStrictHostKeyChecking=no -oUserKnownHostsFile=/dev/null -r {HOST_HOME}/fdroid/repo/* deployer@selfprivacy.org:/var/www/fdroid.selfprivacy.org"], shell=True) # Arguments