From 0c539a23c3dcd22bef702915aa70974dbf04eb0b Mon Sep 17 00:00:00 2001
From: Jon <jonathon.lockwood@networkedweb.com>
Date: Sun, 30 Apr 2023 09:46:15 +0930
Subject: [PATCH] feat(publish): clean remote dir first anduse correct source

!8
---
 .gitignore     | 5 +++++
 .gitlab-ci.yml | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 1e96a14..5a14931 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,8 @@ package*json
 
 # ignore log files
 *.log
+
+#gitlab temp files
+artifacts.zip
+artifacts/
+public/
\ No newline at end of file
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cad4047..8415664 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -180,11 +180,13 @@ public_website:
     - apt install --no-install-recommends -y ssh
     - ls -la "$CI_PROJECT_DIR/artifacts/prepare/Assemble Site/build"
     - mv "$CI_PROJECT_DIR/artifacts/prepare/Assemble Site/build" "$CI_PROJECT_DIR/public"
+    - rm -Rf "$CI_PROJECT_DIR/public/build"
     - ls -la "$CI_PROJECT_DIR"
     - ls -la "$CI_PROJECT_DIR/public"
     - *Add_SSHKey_Before_Script
   script:
-    - scp -r "$CI_PROJECT_DIR/public" ${ANSIBLE_USER}@${HOST_PUBLIC_WEBSITE}:${PUBLIC_WEBSITE_PATH}
+    - ssh ${ANSIBLE_USER}@${HOST_PUBLIC_WEBSITE} sudo rm -Rf ${PUBLIC_WEBSITE_PATH}/*
+    - scp -r "$CI_PROJECT_DIR/public/*" ${ANSIBLE_USER}@${HOST_PUBLIC_WEBSITE}:${PUBLIC_WEBSITE_PATH}
   needs: [ 'Assemble Site', 'Unit Tests']
   environment: 
     name: production