diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b87e13377cd5f6e8b9dc9a213803819aefbc4dc0..15c629c045bab0158c7e7e704a38fbf0f1819ac6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -63,7 +63,7 @@ sync: - ( eval $(ssh-agent -s); echo "${SSH_PULL_PRIVATE_KEY}" | tr -d '\r' | ssh-add - > /dev/null && mkdir -p ~/.ssh && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config ) || true - ( eval $(ssh-agent -s); echo "${SSH_PUSH_PRIVATE_KEY}" | tr -d '\r' | ssh-add - > /dev/null && mkdir -p ~/.ssh && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config ) || true script: - - echo "Git push url - ${GIT_PUSH_URL}" && git clone "${GIT_PUSH_URL}" /tmp/repo && cd /tmp/repo && git checkout "${GIT_PUSH_BRANCH:-master}" - - echo "Git pull url - ${GIT_PULL_URL}" && git remote add upstream "${GIT_PULL_URL}" && git pull --ff-only upstream "${GIT_PULL_BRANCH:-master}" + - echo "Destination url - ${GIT_PUSH_URL}" && git clone "${GIT_PUSH_URL}" /tmp/repo && cd /tmp/repo && git checkout "${GIT_PUSH_BRANCH:-master}" + - git remote add upstream "${GIT_PULL_URL}" && git pull --ff-only upstream "${GIT_PULL_BRANCH:-master}" - git pull --ff-only upstream "${GIT_PULL_BRANCH:-master}" - git push origin "${GIT_PUSH_BRANCH:-master}"