Skip to content

Commit f25dd22

Browse files
committed
Fix the release maker, when there are no previous releases
1 parent 3f6ebdb commit f25dd22

File tree

1 file changed

+13
-12
lines changed

1 file changed

+13
-12
lines changed

src/index.js

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ function makeRelease(gren, releaseOptions) {
2525
responseText.message + '\n'
2626
+ responseText.errors[0].code
2727
);
28-
reject();
28+
reject(false);
2929
} else {
3030
console.log(release.tag_name + ' successfully created!');
31-
resolve();
31+
resolve(true);
3232
}
3333
});
3434
});
@@ -69,7 +69,7 @@ function prepareRelease(gren, tagName, commitMessages) {
6969
var body = commitMessages
7070
.slice(0, -1)
7171
.filter(function (message) {
72-
return !message.match(/^merge/i) && !message.match(/^[x]/);
72+
return !message.match(/^merge/i);
7373
})
7474
.map(createBody)
7575
.join('\n');
@@ -146,8 +146,8 @@ function getLastTags(gren, releaseTagName) {
146146
if(err) {
147147
reject(err);
148148
} else {
149-
var filteredTags = tags.filter(function (tag, index) {
150-
return index === 0 || tag.name === releaseTagName;
149+
var filteredTags = tags.filter(function(tag, index) {
150+
return index === 0 || (releaseTagName ? tag.name === releaseTagName : index === tags.length-1 );
151151
});
152152

153153
resolve(filteredTags);
@@ -166,10 +166,14 @@ function getLastTags(gren, releaseTagName) {
166166
function getLatestRelease(gren) {
167167
return new Promise(function (resolve, reject) {
168168
gren.repo.getLatestRelease(function (err, release) {
169-
if(err) {
169+
if(err && err.request.status !== 404) {
170170
reject(err);
171171
} else {
172-
resolve(release.tag_name);
172+
if(err && err.request.status === 404) {
173+
resolve(false);
174+
} else {
175+
resolve(release.tag_name);
176+
}
173177
}
174178
});
175179
});
@@ -237,11 +241,8 @@ GithubReleaseNotes.prototype.release = function() {
237241
.then(function (commitMessages) {
238242
return prepareRelease(that, tagName, commitMessages);
239243
})
240-
.then(function () {
241-
return true;
242-
},
243-
function() {
244-
return false;
244+
.then(function (success) {
245+
return success;
245246
})
246247
.catch(function (error) {
247248
console.error(error);

0 commit comments

Comments
 (0)