From 1fff6e28c744749931fc3a7828cb34d2a76f3688 Mon Sep 17 00:00:00 2001 From: Vit Stanislav Date: Mon, 31 Jul 2017 14:49:14 +0200 Subject: [PATCH 1/4] Send coverage to coveralls by separate command --- Jenkinsfile | 1 + karma.conf.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3e8e91861..265cdaf83 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -76,6 +76,7 @@ node('lisk-nano-01'){ # Run test cd $WORKSPACE npm run test + cat "coverage/Chrome 58.0.3029 (Linux 0.0.0)/lcov.info" | coveralls -v ''' } catch (err) { currentBuild.result = 'FAILURE' diff --git a/karma.conf.js b/karma.conf.js index bdb21eb73..5608fe2b0 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -14,7 +14,7 @@ module.exports = function (config) { preprocessors: { [fileGlob]: ['webpack'], }, - reporters: ['coverage', 'mocha'].concat(onJenkins ? ['coveralls'] : []), + reporters: ['coverage', 'mocha'], coverageReporter: { reporters: [ { From 1b5acd7d2826836d9aed6fe74b6eeb17be4d938a Mon Sep 17 00:00:00 2001 From: Vit Stanislav Date: Mon, 31 Jul 2017 15:08:08 +0200 Subject: [PATCH 2/4] Make coveralls submission independent of Chrome version --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 265cdaf83..62cb652b5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -76,7 +76,7 @@ node('lisk-nano-01'){ # Run test cd $WORKSPACE npm run test - cat "coverage/Chrome 58.0.3029 (Linux 0.0.0)/lcov.info" | coveralls -v + cat coverage/*/lcov.info | coveralls -v ''' } catch (err) { currentBuild.result = 'FAILURE' From 205183794e5117cf0ef5e3df8548cd390de8d902 Mon Sep 17 00:00:00 2001 From: Vit Stanislav Date: Mon, 31 Jul 2017 15:26:17 +0200 Subject: [PATCH 3/4] Removed no longer used 'karma-coveralls' from dependencies --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 765524bc9..229dd300a 100644 --- a/package.json +++ b/package.json @@ -81,7 +81,6 @@ "karma-chai": "=0.1.0", "karma-chrome-launcher": "=2.0.0", "karma-coverage": "=1.1.1", - "karma-coveralls": "=1.1.2", "karma-jenkins-reporter": "0.0.2", "karma-mocha": "=1.3.0", "karma-mocha-reporter": "=2.2.3", From 41e3c6c56fcf08da4b7017a5f47b3d23bd7c5481 Mon Sep 17 00:00:00 2001 From: Vit Stanislav Date: Mon, 31 Jul 2017 15:26:44 +0200 Subject: [PATCH 4/4] Add comment to coveralls submission --- Jenkinsfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 62cb652b5..6672fb46d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -76,6 +76,8 @@ node('lisk-nano-01'){ # Run test cd $WORKSPACE npm run test + + # Submit coverage to coveralls cat coverage/*/lcov.info | coveralls -v ''' } catch (err) {