From b465f01b7e712712ec825cf7340d3c373c8c2a16 Mon Sep 17 00:00:00 2001 From: souljungkim Date: Sat, 21 Mar 2020 14:30:35 +0900 Subject: [PATCH 1/3] refs #79 - Add badge for coverage from coveralls --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 04a0211..4dff8b1 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ [![Build Status](https://travis-ci.org/avaj-java/installer-maker.svg?branch=master)](https://travis-ci.org/avaj-java/installer-maker) +[![Coverage Status](https://coveralls.io/repos/github/avaj-java/installer-maker/badge.svg)](https://coveralls.io/github/avaj-java/installer-maker) [![All Download](https://img.shields.io/github/downloads/avaj-java/installer-maker/total.svg)](https://github.com/avaj-java/installer-maker/releases) [![Release](https://img.shields.io/github/release/avaj-java/installer-maker.svg)](https://github.com/avaj-java/installer-maker/releases) [![License](https://img.shields.io/github/license/avaj-java/installer-maker.svg)](https://github.com/avaj-java/installer-maker/releases) From cdf4d22df89bda4014118ce7f672312b69d37bae Mon Sep 17 00:00:00 2001 From: souljungkim Date: Sat, 21 Mar 2020 14:32:42 +0900 Subject: [PATCH 2/3] refs #79 - Update build.gradle - add tasks and setup to generate coveral reports --- build.gradle | 62 +++++++++++++++++++++++++++++++++++++++++++++++-- settings.gradle | 2 ++ 2 files changed, 62 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index b611766..46cdf53 100644 --- a/build.gradle +++ b/build.gradle @@ -1,3 +1,5 @@ +group 'jaemisseo' + apply plugin: "groovy" apply plugin: "java" apply plugin: "application" @@ -19,6 +21,9 @@ buildscript { maven { url 'https://repo.spring.io/snapshot' } maven { url "https://jitpack.io" } } + dependencies { + classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.8.2' + } } task wrapper(type: Wrapper) { @@ -51,8 +56,8 @@ sourceSets { * Define Variable&Function * **************************************************/ -sourceCompatibility = "1.6" -targetCompatibility = "1.6" +sourceCompatibility = JavaVersion.VERSION_1_6 +targetCompatibility = JavaVersion.VERSION_1_6 String projectName = "installer-maker" version = "git describe --tags".execute([], project.projectDir).text.trim() @@ -170,12 +175,30 @@ jar.rootSpec.exclude( fileTree(dir: 'external_lib_dev', include: ['*.jar']).coll + + +/************************************************** + * + * Setup All Projects + * + **************************************************/ +allprojects { + apply plugin: 'com.github.kt3k.coveralls' + apply plugin: 'jacoco' + + repositories { + jcenter() + } +} + /************************************************** * * Setup Each Sub Projects * **************************************************/ subprojects { + apply plugin: 'java' + /************************* * Gethering Module's Git Info *************************/ @@ -189,6 +212,14 @@ subprojects { //Message to Sub Gradle ext.setProperty('modeParentRemoteDependencies', modeRemoteDependencies) + + /** jacocoTestReport to Submodules **/ + jacocoTestReport { + reports { + html.enabled = true + xml.enabled = true + } + } } if (modeRemoteDependencies){ @@ -242,6 +273,33 @@ printSubject "Check - Start Task" * Tasks * **************************************************/ + +/************************* + * + * TASK - jacoco to report coverage + * + *************************/ +// 각 서브모듈들의 JacocoReport 취합 +task jacocoRootReport(type: JacocoReport) { + description = 'Generates an aggregate report from all subprojects' + dependsOn = subprojects.test + sourceDirectories = files(subprojects.sourceSets.main.allSource.srcDirs) + classDirectories = files(subprojects.sourceSets.main.output) + executionData = files(subprojects.jacocoTestReport.executionData) + reports { + html.enabled = true // human readable + xml.enabled = true // required by coveralls + } +} + +/** coveralls Task로 jacocoRootReport 로 취합된 결과만 전송 **/ +coveralls { + sourceDirs = subprojects.sourceSets.main.allSource.srcDirs.flatten() + jacocoReportPath = "${buildDir}/reports/jacoco/jacocoRootReport/jacocoRootReport.xml" +} + + + /************************* * * TASK - jar diff --git a/settings.gradle b/settings.gradle index 61ded0b..5ec06bb 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,4 @@ +rootProject.name = 'installer-maker' + include 'command-man', "common-util", "common-man", "fileman", "reportman", "restman" From 6c21f5b88c5f95badb6eea07fefa7c2835f5dc00 Mon Sep 17 00:00:00 2001 From: souljungkim Date: Sat, 21 Mar 2020 14:34:16 +0900 Subject: [PATCH 3/3] refs #79 - Update .travis.yml - add after_success script - run gradle task jacocoTestReport coveralls to send reports to coveralls --- .travis.yml | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6e3c1f0..74c9b01 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,20 @@ +################################################## +# +# Environment +# +################################################## language: groovy jdk: - openjdk8 os: - linux + + +################################################## +# +# CACHE +# +################################################## before_cache: - echo "################################################## START CACHE" - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock @@ -13,16 +25,29 @@ cache: - "$HOME/.gradle/wrapper/" after_cache: - echo "################################################## FINISH CACHE" + + + +################################################## +# +# SCRIPT +# +################################################## script: - - gradle clean build + - ./gradlew clean build - export RELEASE_PKG_FILE=$(ls build/distributions/*.zip) - echo "# Zip File => $RELEASE_PKG_FILE" + +################################################## +# +# DEPLOY +# +################################################## before_deploy: - export RELEASE_PKG_FILE=$(ls build/distributions/*.zip) - echo "################################################## START DEPLOY " - echo "# Deploying $RELEASE_PKG_FILE to GitHsub releases" - deploy: provider: releases api_key: @@ -34,10 +59,10 @@ deploy: tags: true repo: avaj-java/installer-maker all_branches: true - after_deploy: - echo "################################################## FINISH DEPLOY" - +after_success: + - ./gradlew jacocoTestReport coveralls