Skip to content

Commit 58724fd

Browse files
get previous version and new version as inputs
1 parent 8afd32e commit 58724fd

File tree

4 files changed

+36
-24
lines changed

4 files changed

+36
-24
lines changed

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ Input | Purpose
4949
------------------|---------------------------------------------------------------------------------------------------------------------------------------
5050
branch-diff-file | File contains commit message difference between head and base branches.
5151
jira-project-key | Jira project key used to extract ticket ids from commit message (TEST key will detect all ticket ids with pattern TEST-<num>).
52+
previous-version | Previous version released
53+
new-version | New version to be released
5254
jira-url | Jira url to use when generating create release ticket link.
5355
5456
## Outputs

action.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@ inputs:
1212
jira-project-key:
1313
description: 'The jira project key'
1414
required: true
15+
previous-version:
16+
description: 'Previous version released'
17+
required: false
18+
new-version:
19+
description: 'New version to be released'
20+
required: false
1521
jira-url:
1622
description: 'The jira create release url'
1723
required: false

dist/index.js

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -461,10 +461,12 @@ var __webpack_exports__ = {};
461461
const fs = __nccwpck_require__(747)
462462
const core = __nccwpck_require__(398);
463463

464-
function generateReleaseNotes(branchDiffFile, projectKeys, createReleaseUrl) {
464+
function generateReleaseNotes(branchDiffFile, projectKeys, previousVersion, newVersion, createReleaseUrl) {
465465
const data = fs.readFileSync(branchDiffFile, 'utf8');
466466
const lines = data.split(/\r?\n/);
467467

468+
console.log("Previous version: " + previousVersion);
469+
console.log("New version: " + newVersion);
468470
console.log("Project keys: " + projectKeys);
469471
console.log("Lines: " + lines.length);
470472

@@ -474,13 +476,8 @@ function generateReleaseNotes(branchDiffFile, projectKeys, createReleaseUrl) {
474476
}
475477

476478
const tickets = {};
477-
let isFeatureChange = false;
478479

479480
for (const line of lines) {
480-
if (line.includes('[FEATURE]')) {
481-
isFeatureChange = true;
482-
}
483-
484481
const words = line.trim().split(" ");
485482

486483
for (const word of words) {
@@ -505,13 +502,15 @@ function generateReleaseNotes(branchDiffFile, projectKeys, createReleaseUrl) {
505502
return partsA[0].localeCompare(partsB[0])
506503
}
507504
});
505+
508506
console.log("Detected tickets: " + JSON.stringify(ticketIds));
509507

510-
let releaseNotes = "## Change type\n";
511-
if (isFeatureChange) {
512-
releaseNotes += "**Minor** change\n"
513-
} else {
514-
releaseNotes += "**Patch** change\n"
508+
let releaseNotes = "";
509+
510+
if (!!previousVersion) {
511+
releaseNotes += "## Version change\n";
512+
releaseNotes += `- Previous version: **${previousVersion}**\n`;
513+
releaseNotes += `- New version: **${newVersion}**\n`;
515514
}
516515

517516
releaseNotes += "## Changes\n";
@@ -537,9 +536,12 @@ async function run() {
537536
try {
538537
const branchDiffFile = core.getInput('branch-diff-file', {required: true});
539538
const projectKey = core.getInput('jira-project-key', {required: true});
539+
const previousVersion = core.getInput("previous-version", {required: false});
540+
const newVersion = core.getInput("new-version", {required: false});
540541
const createReleaseUrl = core.getInput('jira-url', {required: false});
541542

542-
const releaseNotes = generateReleaseNotes(branchDiffFile, projectKey.split(","), createReleaseUrl);
543+
const releaseNotes = generateReleaseNotes(branchDiffFile, projectKey.split(","), previousVersion,
544+
newVersion, createReleaseUrl);
543545
core.setOutput('release-notes', releaseNotes);
544546
} catch (error) {
545547
core.error(error);

index.js

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
const fs = require('fs')
22
const core = require('@actions/core');
33

4-
function generateReleaseNotes(branchDiffFile, projectKeys, createReleaseUrl) {
4+
function generateReleaseNotes(branchDiffFile, projectKeys, previousVersion, newVersion, createReleaseUrl) {
55
const data = fs.readFileSync(branchDiffFile, 'utf8');
66
const lines = data.split(/\r?\n/);
77

8+
console.log("Previous version: " + previousVersion);
9+
console.log("New version: " + newVersion);
810
console.log("Project keys: " + projectKeys);
911
console.log("Lines: " + lines.length);
1012

@@ -14,13 +16,8 @@ function generateReleaseNotes(branchDiffFile, projectKeys, createReleaseUrl) {
1416
}
1517

1618
const tickets = {};
17-
let isFeatureChange = false;
1819

1920
for (const line of lines) {
20-
if (line.includes('[FEATURE]')) {
21-
isFeatureChange = true;
22-
}
23-
2421
const words = line.trim().split(" ");
2522

2623
for (const word of words) {
@@ -45,13 +42,15 @@ function generateReleaseNotes(branchDiffFile, projectKeys, createReleaseUrl) {
4542
return partsA[0].localeCompare(partsB[0])
4643
}
4744
});
45+
4846
console.log("Detected tickets: " + JSON.stringify(ticketIds));
4947

50-
let releaseNotes = "## Change type\n";
51-
if (isFeatureChange) {
52-
releaseNotes += "**Minor** change\n"
53-
} else {
54-
releaseNotes += "**Patch** change\n"
48+
let releaseNotes = "";
49+
50+
if (!!previousVersion) {
51+
releaseNotes += "## Version change\n";
52+
releaseNotes += `- Previous version: **${previousVersion}**\n`;
53+
releaseNotes += `- New version: **${newVersion}**\n`;
5554
}
5655

5756
releaseNotes += "## Changes\n";
@@ -77,9 +76,12 @@ async function run() {
7776
try {
7877
const branchDiffFile = core.getInput('branch-diff-file', {required: true});
7978
const projectKey = core.getInput('jira-project-key', {required: true});
79+
const previousVersion = core.getInput("previous-version", {required: false});
80+
const newVersion = core.getInput("new-version", {required: false});
8081
const createReleaseUrl = core.getInput('jira-url', {required: false});
8182

82-
const releaseNotes = generateReleaseNotes(branchDiffFile, projectKey.split(","), createReleaseUrl);
83+
const releaseNotes = generateReleaseNotes(branchDiffFile, projectKey.split(","), previousVersion,
84+
newVersion, createReleaseUrl);
8385
core.setOutput('release-notes', releaseNotes);
8486
} catch (error) {
8587
core.error(error);

0 commit comments

Comments
 (0)