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

Trunk

parent 24ee89dc
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -29,6 +29,6 @@ sync:
    - ( eval $(ssh-agent -s); echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null && mkdir -p ~/.ssh && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config ) || true
    - git checkout --track origin/master && git pull --ff-only
    - git remote add upstream "${GIT_URL}" && git fetch upstream
    - git pull "upstream/${GIT_UPSTGREAM_BRANCH}"
    - git pull --ff-only upstream/${GIT_UPSTGREAM_BRANCH}
    - echo -e "machine ${CI_SERVER_HOST}\nlogin ${GIT_PUSH_LOGIN}\npassword ${GIT_PUSH_PASSWORD}" > ~/.netrc
    - git push