From 51cbd34cce0bb1e1f3efca53f9a62660fb4075da Mon Sep 17 00:00:00 2001 From: Override-6 Date: Sat, 21 Jan 2023 15:38:42 +0100 Subject: [PATCH] updating drone --- drone/.drone.yml | 2 ++ drone/deliver.sh | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/drone/.drone.yml b/drone/.drone.yml index b9bf09c..fca024a 100644 --- a/drone/.drone.yml +++ b/drone/.drone.yml @@ -14,6 +14,7 @@ steps: commands: - bash drone/deliver.sh android - bash drone/android-sign.sh + - name: Electron image: override6/tbasket-frontend environment: @@ -21,6 +22,7 @@ steps: from_secret: SSH_PRIVATE SSH_PUBLIC_KEY: from_secret: SSH_PUBLIC + commands: - bash drone/deliver.sh electron - name: Web diff --git a/drone/deliver.sh b/drone/deliver.sh index 662e664..c3fc035 100755 --- a/drone/deliver.sh +++ b/drone/deliver.sh @@ -34,6 +34,7 @@ case "$TYPE" in "browser") OUT_DIR="platforms/browser/www/*" SERV_DIR="/server/apache/TBasket/" + tree -d || ls ;; "electron") OUT_DIR="platforms/electron/build" @@ -54,4 +55,7 @@ echo "delivering outputs on server" echo "making delivery onto '$USER@$IP:$SERV_DIR'" -scp -o "StrictHostKeyChecking no" -r "$OUT_DIR" "$USER@$IP:$SERV_DIR" \ No newline at end of file +rsync -avz -I \ + --rsync-path="mkdir -p \"$SERV_DIR\" && rsync" \ + -e "ssh -o StrictHostKeyChecking=no" \ + --delete "$OUT_DIR" "$USER@$IP" \ No newline at end of file