diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c1f6197..dc9db52 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,11 +9,10 @@ before_script: - mvn --version stages: - - ant - - maven + - all ant_job: - stage: ant + stage: all script: - ant all #- awk -F, '{ instructions += $4 + $5; covered += $5 } END { print "===============================================\nCoverage Results:\n\n", covered, " / ", instructions, " instructions covered"; print "Total", 100*covered/instructions, "% covered\n==\n===============================================" }' out/coverage/site/jacoco.csv @@ -26,20 +25,3 @@ ant_job: reports: junit: out/junit/TEST-*.xml -maven_job: - stage: maven - script: - - mvn $MAVEN_CLI_OPTS checkstyle:checkstyle - - mvn $MAVEN_CLI_OPTS formatter:validate - - mvn $MAVEN_CLI_OPTS compile - - mvn $MAVEN_CLI_OPTS test - - mvn $MAVEN_CLI_OPTS -Dmaven.test.skip=true compile package javadoc:javadoc javadoc:jar - - awk -F, '{ instructions += $4 + $5; covered += $5 } END { print "===============================================\nCoverage Results:\n\n", covered, " / ", instructions, " instructions covered"; print "Total", 100*covered/instructions, "% covered\n==\n===============================================" }' target/site/jacoco/jacoco.csv - artifacts: - when: on_success - expire_in: 3 day - paths: - - target/site/jacoco - - target/*.jar - reports: - junit: target/surefire-reports/TEST-*.xml