Commit 2b71eecc authored by Дмитрий Сафронов's avatar Дмитрий Сафронов
Browse files

Merge branch 'fix' into 'master' 

fetch tags

See merge request tools/continuous-integration/infrastructure/sync-fork!26
parents be360332 94184705

.gitlab-ci.yml

+1 −2
Original line number Diff line number Diff line
@@ -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}"