From f3a24154b47b5636b7b667a34d83853435044485 Mon Sep 17 00:00:00 2001 From: PhilKunz Date: Sat, 2 Apr 2016 19:22:01 +0200 Subject: [PATCH] now publishing coverage every time on travis since codecov does a good job sorting anything unwanted out --- dist/npmts.options.js | 7 +++++-- ts/npmts.options.ts | 8 ++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dist/npmts.options.js b/dist/npmts.options.js index 791ae63..d9ae0bb 100644 --- a/dist/npmts.options.js +++ b/dist/npmts.options.js @@ -1,6 +1,9 @@ "use strict"; /// var plugins = require("./npmts.plugins"); +exports.isCi = function () { + return plugins.smartci.check.isCi(); +}; exports.isRelease = function () { return plugins.smartci.check.isCi() && plugins.smartci.check.isTaggedCommit(); @@ -28,11 +31,11 @@ exports.run = function (configArg) { // handle state of current build exports.isRelease() ? plugins.beautylog.info("All right: This is a RELEASE build!") : plugins.beautylog.info("NOT A RELEASE build!"); - exports.isRelease() && exports.doPublish() ? plugins.beautylog.info("All right: This is the first subBuild, so this one publishes coverage and docs when tests succeed!") + exports.isRelease() && exports.doPublish() ? plugins.beautylog.info("All right: This is the first subBuild, so this one publishes COVERAGE + DOCS when tests succeed!") : plugins.beautylog.info("We are not publishing anything!"); // handle coveralls config.codecov ? void (0) : config.codecov = true; - exports.doPublish() ? void (0) : config.codecov = false; + exports.isCi() ? void (0) : config.codecov = false; config.coverageTreshold ? void (0) : config.coverageTreshold = 70; // handle docs config.docs ? void (0) : config.docs = {}; diff --git a/ts/npmts.options.ts b/ts/npmts.options.ts index 83d8c24..300b31a 100644 --- a/ts/npmts.options.ts +++ b/ts/npmts.options.ts @@ -1,6 +1,10 @@ /// import plugins = require("./npmts.plugins"); +export let isCi = function(){ + return plugins.smartci.check.isCi(); +}; + export let isRelease = function():boolean { return plugins.smartci.check.isCi() && plugins.smartci.check.isTaggedCommit(); @@ -33,12 +37,12 @@ export var run = function(configArg){ isRelease() ? plugins.beautylog.info("All right: This is a RELEASE build!") : plugins.beautylog.info("NOT A RELEASE build!"); - isRelease() && doPublish() ? plugins.beautylog.info("All right: This is the first subBuild, so this one publishes coverage and docs when tests succeed!") + isRelease() && doPublish() ? plugins.beautylog.info("All right: This is the first subBuild, so this one publishes COVERAGE + DOCS when tests succeed!") : plugins.beautylog.info("We are not publishing anything!"); // handle coveralls config.codecov ? void(0) : config.codecov = true; - doPublish() ? void(0) : config.codecov = false; + isCi() ? void(0) : config.codecov = false; config.coverageTreshold ? void(0) : config.coverageTreshold = 70;