From 8abce7f4a96fb4c93698b982c339a185de81c036 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Fri, 9 Mar 2018 19:53:26 +0000 Subject: [PATCH 1/5] jenkins: added --- Jenkinsfile.groovy | 79 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 Jenkinsfile.groovy diff --git a/Jenkinsfile.groovy b/Jenkinsfile.groovy new file mode 100644 index 0000000..5a9aa2e --- /dev/null +++ b/Jenkinsfile.groovy @@ -0,0 +1,79 @@ +// non-standard Jenksinfile +// * only publish code coverage to codacy for builder module +// * only deploy artifacts for ruleset and tile modules + +final String mvn = "mvn --batch-mode --update-snapshots" + +pipeline { + agent any + stages { + stage('Environment') { + steps { + sh 'set' + } + } + stage('no SNAPSHOT in master') { + // checks that the pom version is not a snapshot when the current or target branch is master + when { + expression { + (env.GIT_BRANCH == 'master' || env.CHANGE_TARGET == 'master') && + (readMavenPom(file: 'pom.xml').version).contains("SNAPSHOT") + } + } + steps { + error("Build failed because SNAPSHOT version") + } + } + stage('Static Code Analysis') { + when { expression { findFiles(glob: '**/src/main/java/*.java').length > 0 } } + steps { + withMaven(maven: 'maven 3.5.2', jdk: 'JDK 1.8') { + sh "${mvn} compile checkstyle:checkstyle pmd:pmd" + } + pmd canComputeNew: false, defaultEncoding: '', healthy: '', pattern: '', unHealthy: '' + } + } + stage('Build Java 9') { + steps { + withMaven(maven: 'maven 3.5.2', jdk: 'JDK 9') { + sh "${mvn} clean install" + } + } + } + stage('Build Java 8') { + steps { + withMaven(maven: 'maven 3.5.2', jdk: 'JDK 1.8') { + sh "${mvn} clean install" + } + } + } + stage('Test Results') { + when { expression { findFiles(glob: '**/target/surefire-reports/*.xml').length > 0 } } + steps { + junit '**/target/surefire-reports/*.xml' + jacoco exclusionPattern: '**/*{Test|IT|Main|Application|Immutable}.class' + withMaven(maven: 'maven 3.5.2', jdk: 'JDK 1.8') { + sh "${mvn} -pl builder com.gavinmogan:codacy-maven-plugin:coverage " + + "-DcoverageReportFile=target/site/jacoco/jacoco.xml " + + "-DprojectToken=`$JENKINS_HOME/codacy/token` " + + "-DapiToken=`$JENKINS_HOME/codacy/apitoken` " + + "-Dcommit=`git rev-parse HEAD`" + } + } + } + stage('Archiving') { + when { expression { findFiles(glob: '**/target/*.jar').length > 0 } } + steps { + archiveArtifacts '**/target/*.jar' + } + } + stage('Deploy') { + when { expression { (env.GIT_BRANCH == 'master' && env.GIT_URL.startsWith('https://')) } } + steps { + withMaven(maven: 'maven 3.5.2', jdk: 'JDK 1.8') { + sh "${mvn} -pl ruleset,tile deploy --activate-profiles release -DskipTests=true" + } + } + } + } +} From 9f9096f657177f2833ef80e924cea7bfd0eca3e9 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Fri, 9 Mar 2018 23:10:31 +0000 Subject: [PATCH 2/5] travis: remove deploy --- .gitmodules | 3 --- .travis.yml | 10 ---------- 2 files changed, 13 deletions(-) delete mode 100644 .gitmodules diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index c50d110..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule ".travis-support"] - path = .travis-support - url = https://github.com/kemitix/kemitix-travis-support.git diff --git a/.travis.yml b/.travis.yml index aa0c9ed..108fbc8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,13 +6,3 @@ cache: - "$HOME/.m2" install: true script: "./mvnw --batch-mode --errors --update-snapshots clean install" -after_success: -- sh .travis-support/coveralls.sh -- bash <(curl -s https://codecov.io/bash) -deploy: - provider: script - script: sh .travis-support/deploy.sh - on: - branch: master -env: - global: From 7069beb049644e0e222a9f421bee317d3dfb3a11 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Sat, 10 Mar 2018 16:22:23 +0000 Subject: [PATCH 3/5] Update artifactId of root pom --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c070c77..6cbff27 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 net.kemitix.checkstyle - root + kemitix-checkstyle-ruleset 4.1.0-SNAPSHOT pom From 7eec43ae0c722068470716604d6dd1dd0b839900 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Sat, 10 Mar 2018 18:41:07 +0000 Subject: [PATCH 4/5] jenkins: update template --- Jenkinsfile.groovy | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/Jenkinsfile.groovy b/Jenkinsfile.groovy index 5a9aa2e..e5409e5 100644 --- a/Jenkinsfile.groovy +++ b/Jenkinsfile.groovy @@ -1,4 +1,4 @@ -// non-standard Jenksinfile +// non-standard Jenkinsfile // * only publish code coverage to codacy for builder module // * only deploy artifacts for ruleset and tile modules @@ -25,24 +25,29 @@ pipeline { } } stage('Static Code Analysis') { - when { expression { findFiles(glob: '**/src/main/java/*.java').length > 0 } } + when { expression { findFiles(glob: '**/src/main/java/**/*.java').length > 0 } } steps { - withMaven(maven: 'maven 3.5.2', jdk: 'JDK 1.8') { - sh "${mvn} compile checkstyle:checkstyle pmd:pmd" + withMaven(maven: 'maven', jdk: 'JDK LTS') { + sh "${mvn} compile" + sh "${mvn} checkstyle:checkstyle" + sh "${mvn} pmd:pmd" + pmd canComputeNew: false, defaultEncoding: '', healthy: '', pattern: '', unHealthy: '' + withSonarQubeEnv('sonarqube') { + sh "${mvn} org.sonarsource.scanner.maven:sonar-maven-plugin:3.4.0.905:sonar" + } } - pmd canComputeNew: false, defaultEncoding: '', healthy: '', pattern: '', unHealthy: '' } } - stage('Build Java 9') { + stage('Build Java Next') { steps { - withMaven(maven: 'maven 3.5.2', jdk: 'JDK 9') { + withMaven(maven: 'maven', jdk: 'JDK Next') { sh "${mvn} clean install" } } } - stage('Build Java 8') { + stage('Build Java LTS') { steps { - withMaven(maven: 'maven 3.5.2', jdk: 'JDK 1.8') { + withMaven(maven: 'maven', jdk: 'JDK LTS') { sh "${mvn} clean install" } } @@ -52,7 +57,7 @@ pipeline { steps { junit '**/target/surefire-reports/*.xml' jacoco exclusionPattern: '**/*{Test|IT|Main|Application|Immutable}.class' - withMaven(maven: 'maven 3.5.2', jdk: 'JDK 1.8') { + withMaven(maven: 'maven', jdk: 'JDK LTS') { sh "${mvn} -pl builder com.gavinmogan:codacy-maven-plugin:coverage " + "-DcoverageReportFile=target/site/jacoco/jacoco.xml " + "-DprojectToken=`$JENKINS_HOME/codacy/token` " + @@ -70,7 +75,7 @@ pipeline { stage('Deploy') { when { expression { (env.GIT_BRANCH == 'master' && env.GIT_URL.startsWith('https://')) } } steps { - withMaven(maven: 'maven 3.5.2', jdk: 'JDK 1.8') { + withMaven(maven: 'maven', jdk: 'JDK LTS') { sh "${mvn} -pl ruleset,tile deploy --activate-profiles release -DskipTests=true" } } From 3b9e9f7e342b9ef3502caf6fc73902c326faedbf Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Sat, 10 Mar 2018 18:47:05 +0000 Subject: [PATCH 5/5] jenkins: disable java next stage until compatibilty fixed --- Jenkinsfile.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile.groovy b/Jenkinsfile.groovy index e5409e5..b6996f0 100644 --- a/Jenkinsfile.groovy +++ b/Jenkinsfile.groovy @@ -39,6 +39,7 @@ pipeline { } } stage('Build Java Next') { + when { expression { true == false } } steps { withMaven(maven: 'maven', jdk: 'JDK Next') { sh "${mvn} clean install"