1
95%
master: 95%

Ran 30 Sep 2015 09:49PM UTC

Files 1

Run time 0s

Badge

Embed ▾

Committed 30 Sep 2015 08:30PM UTC coverage: 95.0%. Remained the same

Job # 42.1

Build Type

push

travis-ci

Committed by U-ISI\justin.murray

Commit Message

Fix for proper semver prerelease naming.
diff --git a/Gruntfile.js b/Gruntfile.js
old mode 100644
new mode 100755
index ffbc053..d666d0e
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -289,7 +289,13 @@ module.exports = function (grunt) {
         var version = grunt.file.readJSON('version.json');
         // Allow the build to be set from the command line: grunt --buildNum=123
         version.build = grunt.option('buildNum') || 0;
-        version.info = '<%= version.major %>.<%= version.minor %>.<%= version.patch %>+<%= version.build %>.<%= gitInfo.branch %>.<%= gitInfo.revId %>';
+
+        var gitInfo = grunt.config.get('gitInfo');
+        if (gitInfo.branch === 'master') {
+            version.info = '<%= version.major %>.<%= version.minor %>.<%= version.patch %>+master.<%= version.build %>.<%= gitInfo.revId %>';
+        } else {
+            version.info = '<%= version.major %>.<%= version.minor %>.<%= version.patch %>-<%= gitInfo.branch %>+<%= version.build %>.<%= gitInfo.revId %>';
+        }
         grunt.config.set('version', version);
         var infoVers = grunt.template.process(version.info);
         grunt.log.writeln('Current build version: ' + infoVers);

Run Details

19 of 20 relevant lines covered (95.0%)

6.8 hits per line

murrayju / EventHandler.js / 42 / 1
95%
master: 95%

README BADGES
x

Markdown

Textile

RDoc

HTML

Rst

Source Files on job 42.1

murrayju / EventHandler.js / 42 / 1 95% master: 95%

README BADGES x

Markdown

Textile

RDoc

HTML

Rst

Source Files on job 42.1

murrayju / EventHandler.js / 42 / 1
95%
master: 95%

README BADGES
x