From 1b0b44a5b78bb400313f72271a5a0e0380823a4b Mon Sep 17 00:00:00 2001 From: kpdecker Date: Fri, 17 Jan 2014 17:18:11 -0600 Subject: [PATCH 1/2] Remove apt git install --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index daccd0b5..902b7412 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,8 +20,6 @@ env: matrix: include: - node_js: "0.10" - before_install: - - sudo apt-get install git env: - PUBLISH=true - secure: pLTzghtVll9yGKJI0AaB0uI8GypfWxLTaIB0ZL8//yN3nAEIKMhf/RRilYTsn/rKj2NUa7vt2edYILi3lttOUlCBOwTc9amiRms1W8Lwr/3IdWPeBLvLuH1zNJRm2lBAwU4LBSqaOwhGaxOQr6KHTnWudhNhgOucxpZfvfI/dFw= From 1b8c0e3c76d8595b49ad30c2a50a1bab47b5ec70 Mon Sep 17 00:00:00 2001 From: kpdecker Date: Fri, 17 Jan 2014 17:18:26 -0600 Subject: [PATCH 2/2] Use git describe to lookup tag --- tasks/util/git.js | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/tasks/util/git.js b/tasks/util/git.js index dc57c91b..a6c9ec1d 100644 --- a/tasks/util/git.js +++ b/tasks/util/git.js @@ -80,20 +80,27 @@ module.exports = { childProcess.exec('git tag -a --message=' + name + ' ' + name, {}, function(err, stdout, stderr) { if (err) { throw new Error('git.tag: ' + err.message); - throw err; } callback(); }); }, tagName: function(callback) { - childProcess.exec('git tag -l --points-at HEAD', {}, function(err, stdout) { + childProcess.exec('git describe --tags', {}, function(err, stdout) { if (err) { throw new Error('git.tagName: ' + err.message); } - var tags = stdout.trim().split(/\n/), - versionTags = tags.filter(function(tag) { return /^v/.test(tag); }); + var tags = stdout.trim().split(/\n/); + tags = tags.filter(function(info) { + info = info.split('-'); + return info.length == 1; + }); + + var versionTags = tags.filter(function(info) { + return /^v/.test(info[0]); + }); + callback(undefined, versionTags[0] || tags[0]); }); }