From 31e45e069951856c4ee32c1572e9c3ac2e8e2d8f Mon Sep 17 00:00:00 2001 From: Graeme Fulton Date: Mon, 22 Apr 2024 20:21:07 +0100 Subject: [PATCH] delete old contents of staging folder and add slash to put files at root of folder --- .github/workflows/deploy.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 37b3b2bd..ea7a46be 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -64,9 +64,11 @@ jobs: # Add the server's host key to known_hosts ssh-keyscan -H ${{ secrets.SERVER_HOST }} >> ~/.ssh/known_hosts - scp -v -r ${{ env.STAGING_DIR_PATH }} ${{ env.SERVER_USER }}@${{ env.SERVER_HOST }}:${{ env.STAGING_DIR_PATH }} - ssh -v ${{ env.SERVER_USER }}@${{ env.SERVER_HOST }} " + scp -r ${{ env.STAGING_DIR_PATH }}/ ${{ env.SERVER_USER }}@${{ env.SERVER_HOST }}:${{ env.STAGING_DIR_PATH }} + ssh ${{ env.SERVER_USER }}@${{ env.SERVER_HOST }} " set -e + echo "Cleaning staging directory..." | tee -a /var/log/prototypr/deploy.log + rm -rf ${{ env.STAGING_DIR_PATH }}/* echo "Checking if live directory exists..." | tee -a /var/log/prototypr/deploy.log if [ -d ${{ env.LIVE_DIR_PATH }} ]; then echo "Moving live directory to backup..." | tee -a /var/log/prototypr/deploy.log