Verified Commit 6e5e72f9 authored by Laurent Heirendt's avatar Laurent Heirendt
Browse files

add merging of local tmp branch

parent 694b6ed3
......@@ -25,12 +25,14 @@ commit:
- url_host=`git remote get-url origin | sed -e "s/https:\/\/gitlab-ci-token:.*@//g"`
- git branch -d $CI_COMMIT_BRANCH # delete existing branch locally
- git checkout -b $CI_COMMIT_BRANCH origin/$CI_COMMIT_BRANCH
- git checkout -b tmpBranch origin/$CI_COMMIT_BRANCH
- git remote set-url origin "https://$GIT_ACCESS_USER:$GIT_ACCESS_TOKEN@${url_host}"
- git config $GIT_ACCESS_USER
- git config $GIT_ACCESS_EMAIL
- git add --all
- git commit -m "Update models"
- git push origin $CI_COMMIT_BRANCH
\ No newline at end of file
- git checkout $CI_COMMIT_BRANCH
- git merge tmpBranch --ff
- git push origin $CI_COMMIT_BRANCH
- git branch -D tmpBranch
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment