Skip to content

Allow providing tag #101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+24 −15
Open

Allow providing tag #101

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 24 additions & 15 deletions lib/data-generators/git-tag-commit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,33 @@ module.exports = CoreObject.extend({
},

generate: function() {
var commitHashLength = this._plugin.readConfig('commitHashLength');
var separator = this._plugin.readConfig('separator');
var info = gitRepoInfo();
var providedTag = this._plugin.readConfig('tag');

if (info === null || info.root === null) {
return RSVP.reject('Could not find git repository');
}
if (providedTag) {
return RSVP.resolve({
revisionKey: providedTag,
timestamp: new Date().toISOString()
});
} else {
var commitHashLength = this._plugin.readConfig('commitHashLength');
var separator = this._plugin.readConfig('separator');
var info = gitRepoInfo();

var tag = info.lastTag;
var sha = info.sha.slice(0, commitHashLength);
if (info === null || info.root === null) {
return RSVP.reject('Could not find git repository');
}

if (!tag || !sha) {
return RSVP.reject('Could not build revision with tag `' + tag + '` and commit hash `' + sha + '`');
}
var tag = info.lastTag;
var sha = info.sha.slice(0, commitHashLength);

return RSVP.resolve({
revisionKey: tag + separator + sha,
timestamp: new Date().toISOString()
});
if (!tag || !sha) {
return RSVP.reject('Could not build revision with tag `' + tag + '` and commit hash `' + sha + '`');
}

return RSVP.resolve({
revisionKey: tag + separator + sha,
timestamp: new Date().toISOString()
});
}
}
});