diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 15c629c045bab0158c7e7e704a38fbf0f1819ac6..b7d3c12c6e48dfca531b680f7ce586a1eef982ee 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -64,6 +64,5 @@ sync: - ( 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 "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 remote add upstream "${GIT_PULL_URL}" && git fetch upstream --tags && git pull --ff-only upstream "${GIT_PULL_BRANCH:-master}" - git push origin "${GIT_PUSH_BRANCH:-master}"