diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 83a3ec661a2c420357bc307ce23bc0bc1820545f..6f700179a66ea7576294c368fe5fbcbd7cefad4c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,8 +9,8 @@ stages: # !!!!!!! README !!!!! # We are in the transition period - and the website is deployed two times - to gitlab pages and to a separate VM # In order to migrate to a new deployment: -# 1) remove "Old deployment section" - build_pages, generate the search index and pages tasks -# 2) rename "new pages" to "pages" in the new deployment section, and "new_public" to "public" +# 1) remove "Old deployment" section - build_pages, generate the search index and pages tasks +# 2) rename "new pages" to "pages" in the new deployment section, and "new_public" to "public"; you might also rename directories (skip "new" part) # 3) remove ".ci/deploy.sh", ".ci/build_indices.sh" @@ -132,7 +132,7 @@ deploy to production: - if: '$CI_COMMIT_BRANCH == "master" && $CI_PROJECT_PATH == "R3/howto-cards"' - if: '$CI_COMMIT_BRANCH == "16-deploy-to-staticpages-vm"' script: - - ssh -p $SSHPORT $SSHCONNECT "mkdir -p ~/sources/public/$CI_COMMIT_BRANCH/$CI_JOB_ID ~/master/public ~/develop/public ~/$CI_COMMIT_BRANCH/public" - - scp -P $SSHPORT -r new_processed_build/* $SSHCONNECT:~/sources/public/$CI_COMMIT_BRANCH/$CI_JOB_ID - - ssh -p $SSHPORT $SSHCONNECT "cd ~/$CI_COMMIT_BRANCH/public && ln -fs ~/sources/public/$CI_COMMIT_BRANCH/$CI_JOB_ID/* . && cd ~/sources/public/$CI_COMMIT_BRANCH && find . -type d -not -newermt '-1 minutes' -exec rm -rf {} +;" + - ssh -p $SSHPORT $SSHCONNECT "mkdir -p ~/$CI_COMMIT_BRANCH/sources/public/$CI_JOB_ID ~/$CI_COMMIT_BRANCH/public" + - scp -P $SSHPORT -r new_processed_build/* $SSHCONNECT:~/$CI_COMMIT_BRANCH/sources/public/$CI_JOB_ID + - ssh -p $SSHPORT $SSHCONNECT "cd ~/$CI_COMMIT_BRANCH/public && ln -fs ../sources/public/$CI_JOB_ID/* . && cd ~/$CI_COMMIT_BRANCH/sources/public/ && find . -type d -not -newermt '-1 minutes' -exec rm -rf {} +;"