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 26842f631b1b9f0c98dfd2015a34d7627e8fbb34 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Sep 26 15:33:13 2017 +0200 update gitlab ci for release --- .gitlab-ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f9967899..2218dd2e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,7 +42,7 @@ release: image: registry.nuiton.org/codelutin/dockerfiles:maven-release stage: release only: - - /^release-(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)(?:-[\da-z\-]+(?:\.[\da-z\-]+)*)?(?:\+[\da-z\-]+(?:\.[\da-z\-]+)*)?$/i + - /^release-.*$/ except: - tags script: @@ -79,11 +79,11 @@ release: - export NEXT_VERSION=$(echo "$VERSION" |perl -pe 's/^(.*)(\d+)(.*)$/$1.($2+1).$3."-SNAPSHOT"/e') - mvn --batch-mode org.codehaus.mojo:versions-maven-plugin::set -DnewVersion=$NEXT_VERSION - git commit -a -m "commit to prepare next development version $NEXT_VERSION [skip ci]" - - git push origin HEAD:$RELEASE --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" - - export FILE_URL=$(echo -e "\n\n"$(curl --request POST --header "PRIVATE-TOKEN:$TOKEN_MR" --form "file=@$OLD_DIR/target/${CI_PROJECT_NAME}-$VERSION.war" https://gitlab.nuiton.org/api/v4/projects/${CI_PROJECT_ID}/uploads |jq --raw-output '.markdown')) - - curl --header "PRIVATE-TOKEN:$TOKEN_MR" --request POST --form "description=$CHANGELOG$FILE_URL" "https://gitlab.nuiton.org/api/v4/projects/${CI_PROJECT_ID}/repository/tags/${TAG_NAME}/release" +# - git push origin HEAD:$RELEASE --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" +# - export FILE_URL=$(echo -e "\n\n"$(curl --request POST --header "PRIVATE-TOKEN:$TOKEN_MR" --form "file=@$OLD_DIR/target/${CI_PROJECT_NAME}-$VERSION.war" https://gitlab.nuiton.org/api/v4/projects/${CI_PROJECT_ID}/uploads |jq --raw-output '.markdown')) +# - curl --header "PRIVATE-TOKEN:$TOKEN_MR" --request POST --form "description=$CHANGELOG$FILE_URL" "https://gitlab.nuiton.org/api/v4/projects/${CI_PROJECT_ID}/repository/tags/${TAG_NAME}/release" artifacts: paths: - pollen-rest-api/target/pollen-rest-api-*.war -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.