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 af2f274704c1a8921929ece18e7d04a806c0b834 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Feb 2 16:55:56 2018 +0100 fix gitlab ci release + fix NPE --- .gitlab-ci.yml | 18 +++++++++++++----- .../chorem/pollen/services/service/VoteService.java | 2 +- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d36c1930..6ba797e1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -56,8 +56,12 @@ 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 @@ -88,13 +92,17 @@ release: - cat CHANGELOG - if [ -f CHANGELOG ]; then git add CHANGELOG; fi - git commit -a -m "release $VERSION success [skip ci]" - - git push origin HEAD:$RELEASE --tags + - pwd + - git branch -a + - git push origin HEAD:$RELEASE + - git flow release finish + - git checkout -f develop + - git push origin HEAD:develop + - git checkout -f master + - git push origin HEAD:master - 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" - - 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: + artifacts: paths: - target/${CI_PROJECT_NAME}-$VERSION-api.war - target/${CI_PROJECT_NAME}-$VERSION-site diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteService.java index 448daeca..6cfab535 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteService.java @@ -161,7 +161,7 @@ public class VoteService extends PollenServiceSupport { if (CollectionUtils.isNotEmpty(voterListMembers) && !getVoteDao().forPollEquals(poll).addEquals(Vote.PROPERTY_VOTER, mainPrincipal).exists()) { voteBean.setVoterName(mainPrincipal.getName()); voteBean.setVoterListMembers(voterListMembers); - } else { + } else if (connectedUser != null) { voteBean.setVoterName(connectedUser.getName()); } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.