Skip to content

Commit 9acdd89

Browse files
committed
Clean the code. Add the avoid message feature
1 parent 79bc79f commit 9acdd89

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

src/index.js

Lines changed: 9 additions & 6 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(false);
28+
reject();
2929
} else {
3030
console.log(release.tag_name + ' successfully created!');
31-
resolve(true);
31+
resolve();
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);
72+
return !message.match(/^merge/i) && !message.match(/^[x]/);
7373
})
7474
.map(createBody)
7575
.join('\n');
@@ -146,7 +146,7 @@ function getLastTags(gren, releaseTagName) {
146146
if(err) {
147147
reject(err);
148148
} else {
149-
var filteredTags = tags.filter(function(tag, index) {
149+
var filteredTags = tags.filter(function (tag, index) {
150150
return index === 0 || tag.name === releaseTagName;
151151
});
152152

@@ -237,8 +237,11 @@ GithubReleaseNotes.prototype.release = function() {
237237
.then(function (commitMessages) {
238238
return prepareRelease(that, tagName, commitMessages);
239239
})
240-
.then(function (success) {
241-
return success;
240+
.then(function () {
241+
return true;
242+
},
243+
function() {
244+
return false;
242245
})
243246
.catch(function (error) {
244247
console.error(error);

0 commit comments

Comments
 (0)