branch develop updated (51c34317 -> de2a4320)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git from 51c34317 Fixes #10746 : Suprression de la MAJ automatique de la position du curseur -> il reste toujours en haut par défaut new de2a4320 Use rules and variables for sonar The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit de2a43208160973d4bb1d0e07bb772c1d1f22bf7 Author: Jean Couteau <couteau@codelutin.com> Date: Thu Oct 1 11:25:30 2020 +0200 Use rules and variables for sonar Summary of changes: .gitlab-ci.yml | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit de2a43208160973d4bb1d0e07bb772c1d1f22bf7 Author: Jean Couteau <couteau@codelutin.com> Date: Thu Oct 1 11:25:30 2020 +0200 Use rules and variables for sonar --- .gitlab-ci.yml | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c90a0e83..451552a1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,7 @@ +include: + - project: 'codelutin/ci' + file: '/ci.yml' + stages: - build - check-releasable @@ -15,6 +19,9 @@ build:with-tests: stage: build script: - mvn clean package + rules: + - if: '$CI_COMMIT_BRANCH !~ "/^release\/.*$/" && $CI_COMMIT_BRANCH !~ "/^master\/.*$/" && $CI_PIPELINE_SOURCE != "schedule"' + except: - /^master.*$/ - /^release\/.*$/ @@ -25,16 +32,14 @@ check-releasable: stage: check-releasable script: - mvn clean verify -e -U -DperformRelease -Dredmine.skipGenerateChanges -Dmaven.javadoc.skip - only: - - /^develop.*$/ - except: - - schedules + rules: + - if: '$CI_COMMIT_BRANCH =~ "/^develop\/.*$/" && $CI_PIPELINE_SOURCE != "schedule"' sonar_job: image: registry.nuiton.org/codelutin/dockerfiles:maven-release-debian9-oracle8 stage: sonar script: - export MAVEN_OPTS="-Xmx1024m" - - mvn -e -U clean verify -DskipRelease org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.1.1688:sonar -Dsonar.host.url=https://qa.codelutin.com -Dsonar.projectKey=com.franciaflex:faxtomail -Dsonar.exclusions='**/faxtomail-ui-swing/**/*.css','**/js/libs/*','**/target/*','**/generated*/*' - only: - - schedules + - 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=com.franciaflex:faxtomail -Dsonar.exclusions='**/faxtomail-ui-swing/**/*.css','**/js/libs/*','**/target/*','**/generated*/*' + rules: + - if: '$CI_PIPELINE_SOURCE == "schedule"' -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm