From 0077f4cc5a9876eabc5513612a54345cc0be4fd2 Mon Sep 17 00:00:00 2001 From: Solomon Laing Date: Sun, 4 Dec 2022 15:20:58 +1030 Subject: [PATCH] finished initial implementation of site and added ci/cd stuffs --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6378f1b..6830384 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,7 +12,7 @@ develop-build-job: only: - develop -master-build-job: +main-build-job: stage: build tags: - hugo @@ -23,7 +23,7 @@ master-build-job: paths: - public/ only: - - master + - main deploy-job: stage: deploy @@ -44,4 +44,4 @@ deploy-job: - scp -o 'ProxyJump "$Live_Server_User"@"$Live_Server_IP"' -o StrictHostKeyChecking=no ../inkletblot-com.tar.gz "$Live_Server_User"@"$Live_Server_Target":/var/www/html - ssh -J "$Live_Server_User"@"$Live_Server_IP" "$Live_Server_User"@"$Live_Server_Target" "rm -Rf /var/www/html/inkletblot-com_old && mv /var/www/html/inkletblot-com /var/www/html/inkletblot-com_old && mkdir /var/www/html/inkletblot-com_build && mkdir /var/www/html/inkletblot-com && tar zxf /var/www/html/inkletblot-com.tar.gz -C /var/www/html/inkletblot-com_build && mv /var/www/html/inkletblot-com_build/dist/inkletblot-com/* /var/www/html/inkletblot-com && rm -Rf /var/www/html/inkletblot-com_build && chmod -R 755 /var/www/html/inkletblot-com && exit" only: - - master + - main