Commit 8229bfc8 authored by Dmitriy Safronov's avatar Dmitriy Safronov
Browse files

gitlab-ci.yml

parent b48fdf20
Loading
Loading
Loading
Loading
+1 −2
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ sync:
    - ( test -n "${GIT_LOGIN}" && test -n "${GIT_PASSWORD}" ) && echo "https://${GIT_LOGIN}:${GIT_PASSWORD}@$(echo ${GIT_URL} | sed -r 's#([^/])/[^/].*#\1#' | sed -e 's|https://||g')" >> ~/.git-credentials || true
    - ( 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
    - cat ~/.git-credentials
    - git checkout master && git pull
    - git remote add upstream "${GIT_URL}" && git fetch upstream
    - git pull upstream "${GIT_UPSTGREAM_BRANCH}"
    - git checkout master && git merge upstream/"${GIT_UPSTGREAM_BRANCH}"
    - git push