From 51b26ffd62f7331d77a6e8e1dadbddf0b18eeffb Mon Sep 17 00:00:00 2001 From: Dmitriy Safronov Date: Sat, 15 May 2021 16:28:37 +0300 Subject: [PATCH] .gitlab-ci.yml --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6503922..b87e133 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: - - 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}" + - 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}" - git pull --ff-only upstream "${GIT_PULL_BRANCH:-master}" - git push origin "${GIT_PUSH_BRANCH:-master}" -- GitLab