diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c876bf814503bd313bd0affb86e75ca3b3694bd0..1a09869cfb7c8bba5e6753e38eda2ef72600896b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -138,8 +138,8 @@ deploy:vm: - echo "$KNOWNHOSTS" > ~/.ssh/known_hosts - chmod 644 ~/.ssh/known_hosts rules: - - if: '$CI_COMMIT_REF_NAME == "develop" && $CI_PROJECT_PATH == "R3/howto-cards"' - - if: '$CI_COMMIT_REF_NAME == "master" && $CI_PROJECT_PATH == "R3/howto-cards"' + - if: '!$CI_MERGE_REQUEST_ID && $CI_COMMIT_REF_NAME == "develop" && $CI_PROJECT_PATH == "R3/howto-cards"' + - if: '!$CI_MERGE_REQUEST_ID && $CI_COMMIT_REF_NAME == "master" && $CI_PROJECT_PATH == "R3/howto-cards"' script: - ssh -p $SSHPORT $SSHCONNECT "mkdir -p ~/$CI_COMMIT_REF_NAME/sources/public/$CI_JOB_ID ~/$CI_COMMIT_REF_NAME/public" - scp -P $SSHPORT -r processed_build/* $SSHCONNECT:~/$CI_COMMIT_REF_NAME/sources/public/$CI_JOB_ID