diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1d57f63..6d6dd3e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,21 @@ stages: + - build - deploy +build-job: + stage: build + tags: + - build + - node + script: + - npm install + - npm run build --prod + artifacts: + paths: + - dist/ + only: + - master + deploy-job: stage: deploy tags: @@ -18,12 +33,10 @@ deploy-job: - chmod 700 ~/.ssh - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" >> ~/.ssh/config' script: - - ssh "$Live_Server_User"@"$Live_Server_Ip" -p 10122 "touch test" - # script: - # - tar zcf ../angularproject.tar.gz ./dist - # - ssh-add < (echo "$Live_Server_Private_Key") - # - scp -o StrictHostKeyChecking=no ../angularproject.tar.gz root@"$Live_Server_IP":/var/www/html/inkletblot-com - # - ssh-add < (echo "$Live_Server_Private_Key") - # - ssh root@"$Live_Server_IP" "rm -Rf /var/www/html/inkletblot-com/angularproject_old && mv /var/www/html/inkletblot-com/angularproject /var/www/html/inkletblot-com/angularproject_old && mkdir /var/www/html/inkletblot-com/angularproject_build && mkdir /var/www/html/inkletblot-com/angularproject && tar zxf /var/www/html/inkletblot-com/angularproject.tar.gz -C /var/www/html/inkletblot-com/angularproject_build && mv /var/www/html/inkletblot-com/angularproject_build/dist/angularproject/* /var/www/html/inkletblot-com/angularproject && rm -Rf /var/www/html/inkletblot-com/angularproject_build && chmod -R 755 /var/www/html/inkletblot-com/angularproject && exit" + - tar zcf ../inkletblot-com.tar.gz ./dist + - ssh-add < (echo "$Live_Server_Private_Key") + - scp -o StrictHostKeyChecking=no ../inkletblot-com.tar.gz "$Live_Server_User"@"$Live_Server_IP":/var/www/html + - ssh-add < (echo "$Live_Server_Private_Key") + - ssh "$Live_Server_User"@"$Live_Server_IP" "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 \ No newline at end of file