This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit addb14141ba68674f9182d8ca30370f45672b2cb Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Jan 8 16:50:26 2018 +0100 correction du job de release --- .gitlab-ci.yml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 27e11616..0f6dee27 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -56,12 +56,8 @@ release: - export GIT_URL=$(echo $CI_REPOSITORY_URL | perl -pe 's#.*@(.+?(\:\d+)?)/#git@\1:#') - echo "create release for $VERSION from $GIT_URL" - cd /tmp - - sudo apt-get install -y git-flow - git clone --no-checkout "$GIT_URL" "release" - cd release - - git checkout -f develop - - git checkout -f master - - git flow init -fd - git checkout -f "$CI_COMMIT_REF_NAME" - if [ ! -f LICENSE.txt ]; then echo "missing LICENSE.txt"; exit 1; fi - if [ ! -f README.md ]; then echo "missing README.md"; exit 1 ;fi @@ -91,14 +87,7 @@ release: - cat CHANGELOG - if [ -f CHANGELOG ]; then git add CHANGELOG; fi - git commit -a -m "release $VERSION success [skip ci]" - - git config -l - - git branch -a - - git push - - git flow release finish -m "Pollen $VERSION" - - git checkout -f develop - - git push - - git checkout -f master - - git push + - git push origin HEAD:$RELEASE --tags - git push --tags - /tmp/release.sh "$TOKEN_MR" "$CI_PROJECT_ID" "$VERSION" close - curl --header "PRIVATE-TOKEN:$TOKEN_MR" --request POST "https://gitlab.nuiton.org/api/v4/projects/${CI_PROJECT_ID}/merge_requests?source_branch=${CI_COMMIT_REF_NAME}&target_branch=master&title=${RELEASE}&remove_source_branch=true&labels=release" -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.