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 cb5815b18db2307cb979f942375756946ad0229a Author: Jean Couteau <couteau@codelutin.com> Date: Thu Oct 1 10:38:36 2020 +0200 Update .gitlab-ci.yml --- .gitlab-ci.yml | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ba19f852..a725a537 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -114,8 +114,8 @@ sonar_job: script: - mvn -e -X clean - 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 + rules: + - if: '$CI_PIPELINE_SOURCE == "schedule"' sonar_job_ui: image: registry.nuiton.org/codelutin/dockerfiles:nodejs10 @@ -124,16 +124,15 @@ sonar_job_ui: - cd pollen-ui-riot-js; npm install - npm install -g sonarqube-scanner - sonar-scanner -Dsonar.host.url="$SONAR_INSTANCE_URL" -Dsonar.projectKey=org.chorem:pollen-ui -Dsonar.projectName=Pollen-UI - only: - - schedules + rules: + - if: '$CI_PIPELINE_SOURCE == "schedule"' docker:latest: image: registry.nuiton.org/codelutin/dockerfiles:docker stage: docker - when: manual - only: - - /^develop$/ - - tags + rules: + - if: '$CI_COMMIT_BRANCH =~ "/^develop\/.*$/" && $CI_COMMIT_TAG =~ "/^$/"' + when: manual artifacts: paths: - pollen-rest-api/target/pollen-rest-api-*.war @@ -154,9 +153,9 @@ docker:latest: docker:feature: image: registry.nuiton.org/codelutin/dockerfiles:docker stage: docker - when: manual - only: - - /^feature.*$/ + rules: + - if: '$CI_COMMIT_BRANCH =~ "/^feature\/.*$/" + when: manual artifacts: paths: - pollen-rest-api/target/pollen-rest-api-*.war @@ -177,9 +176,9 @@ docker:feature: docker-feature: image: registry.nuiton.org/codelutin/dockerfiles:docker stage: release - when: manual - only: - - /^feature.*$/ + rules: + - if: '$CI_COMMIT_BRANCH =~ "/^feature\/.*$/" + when: manual 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>.