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 c90ea3676d6f869a69c5de08e9ca4e1582609e1e Author: Jean Couteau <couteau@codelutin.com> Date: Thu Oct 1 09:36:41 2020 +0200 Update .gitlab-ci.yml -> use sonar variables and use rules when possible --- .gitlab-ci.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b3277f98..08c65e8b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -36,10 +36,9 @@ release: image: registry.nuiton.org/codelutin/dockerfiles:maven-release-with-frequent-libraries stage: release when: manual - only: - - /^release\/.*$/ - except: - - tags + + rules: + - if: $CI_COMMIT_BRANCH =~ "/^release\/.*$/" && !$CI_COMMIT_TAG script: - export OLD_DIR=$PWD - export RELEASE=${CI_COMMIT_REF_NAME} @@ -111,7 +110,7 @@ sonar_job: stage: sonar script: - mvn -e -X clean - - mvn -e -U clean verify -DskipRelease org.sonarsource.scanner.maven:sonar-maven-plugin:3.4.0.905:sonar -Dsonar.host.url=https://qa.codelutin.com -Dsonar.projectKey=org.chorem:pollen -Dsonar.exclusions='**/js/libs/*','**/target/*','**/generated*/*' + - mvn -e -U clean verify -DskipRelease org.sonarsource.scanner.maven:sonar-maven-plugin:$MAVEN_SONAR_PLUGIN_VERSION:sonar -Dsonar.host.url="$SONAR_INSTANCE_URL" -Dsonar.projectKey=org.chorem:pollen -Dsonar.exclusions='**/js/libs/*','**/target/*','**/generated*/*' only: - schedules @@ -121,7 +120,7 @@ sonar_job_ui: script: - cd pollen-ui-riot-js; npm install - npm install -g sonarqube-scanner - - sonar-scanner -Dsonar.host.url=https://qa.codelutin.com -Dsonar.projectKey=org.chorem:pollen-ui -Dsonar.projectName=Pollen-UI + - sonar-scanner -Dsonar.host.url="$SONAR_INSTANCE_URL" -Dsonar.projectKey=org.chorem:pollen-ui -Dsonar.projectName=Pollen-UI only: - schedules -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.