Skip to content

Commit 8afd32e

Browse files
sort ticket ids before generation changelog
1 parent f7c42e3 commit 8afd32e

File tree

2 files changed

+26
-6
lines changed

2 files changed

+26
-6
lines changed

dist/index.js

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,7 @@ function generateReleaseNotes(branchDiffFile, projectKeys, createReleaseUrl) {
470470

471471
const regExps = [];
472472
for (const projectKey of projectKeys) {
473-
regExps.push(new RegExp(`${projectKey}-([0-9]*)`))
473+
regExps.push(new RegExp(`${projectKey.trim()}-([0-9]*)`))
474474
}
475475

476476
const tickets = {};
@@ -494,13 +494,23 @@ function generateReleaseNotes(branchDiffFile, projectKeys, createReleaseUrl) {
494494
}
495495
}
496496

497-
const ticketIds = Object.keys(tickets);
497+
const ticketIds = Object.keys(tickets)
498+
.sort((a, b) => {
499+
const partsA = a.split("-");
500+
const partsB = b.split("-");
501+
502+
if (partsA[0] === partsB[0]) {
503+
return +partsA[1] - +partsB[1];
504+
} else {
505+
return partsA[0].localeCompare(partsB[0])
506+
}
507+
});
498508
console.log("Detected tickets: " + JSON.stringify(ticketIds));
499509

500510
let releaseNotes = "## Change type\n";
501511
if (isFeatureChange) {
502512
releaseNotes += "**Minor** change\n"
503-
} else{
513+
} else {
504514
releaseNotes += "**Patch** change\n"
505515
}
506516

index.js

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ function generateReleaseNotes(branchDiffFile, projectKeys, createReleaseUrl) {
1010

1111
const regExps = [];
1212
for (const projectKey of projectKeys) {
13-
regExps.push(new RegExp(`${projectKey}-([0-9]*)`))
13+
regExps.push(new RegExp(`${projectKey.trim()}-([0-9]*)`))
1414
}
1515

1616
const tickets = {};
@@ -34,13 +34,23 @@ function generateReleaseNotes(branchDiffFile, projectKeys, createReleaseUrl) {
3434
}
3535
}
3636

37-
const ticketIds = Object.keys(tickets);
37+
const ticketIds = Object.keys(tickets)
38+
.sort((a, b) => {
39+
const partsA = a.split("-");
40+
const partsB = b.split("-");
41+
42+
if (partsA[0] === partsB[0]) {
43+
return +partsA[1] - +partsB[1];
44+
} else {
45+
return partsA[0].localeCompare(partsB[0])
46+
}
47+
});
3848
console.log("Detected tickets: " + JSON.stringify(ticketIds));
3949

4050
let releaseNotes = "## Change type\n";
4151
if (isFeatureChange) {
4252
releaseNotes += "**Minor** change\n"
43-
} else{
53+
} else {
4454
releaseNotes += "**Patch** change\n"
4555
}
4656

0 commit comments

Comments
 (0)