Skip to content

Commit 6e2dfc5

Browse files
release notes add view release link
1 parent be18b51 commit 6e2dfc5

File tree

2 files changed

+34
-18
lines changed

2 files changed

+34
-18
lines changed

dist/index.js

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

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

@@ -526,15 +526,22 @@ function generateReleaseNotes(branchDiffFile, projectKeys, previousVersion, newV
526526
releaseNotes += `- ${ticketId}\n`;
527527
}
528528

529-
if (!!createReleaseUrl) {
530-
let createRelease = createReleaseUrl + "&issuelinks-linktype=releases&issuelinks-issues=DELETE";
529+
if (!!viewReleaseUrl || !!createReleaseUrl) {
530+
releaseNotes += `\n## Links\n`;
531531

532-
for (const ticketId of ticketIds) {
533-
createRelease += `&issuelinks-issues=${ticketId}`
532+
if (!!viewReleaseUrl) {
533+
releaseNotes += `- [View Release Ticket](${encodeURI(viewReleaseUrl)})`;
534534
}
535535

536-
releaseNotes += `\n## Links\n`;
537-
releaseNotes += `- [Create Release Ticket](${encodeURI(createRelease)})`;
536+
if (!!createReleaseUrl) {
537+
let createRelease = createReleaseUrl + "&issuelinks-linktype=releases&issuelinks-issues=DELETE";
538+
539+
for (const ticketId of ticketIds) {
540+
createRelease += `&issuelinks-issues=${ticketId}`
541+
}
542+
543+
releaseNotes += `- [Create Release Ticket](${encodeURI(createRelease)})`;
544+
}
538545
}
539546

540547
return releaseNotes;
@@ -546,10 +553,11 @@ async function run() {
546553
const projectKey = core.getInput('jira-project-key', {required: true});
547554
const previousVersion = core.getInput("previous-version", {required: false});
548555
const newVersion = core.getInput("new-version", {required: false});
549-
const createReleaseUrl = core.getInput('jira-url', {required: false});
556+
const viewReleaseUrl = core.getInput("jira-view-release", {required: false})
557+
const createReleaseUrl = core.getInput('jira-create-release', {required: false});
550558

551559
const releaseNotes = generateReleaseNotes(branchDiffFile, projectKey.split(","), previousVersion,
552-
newVersion, createReleaseUrl);
560+
newVersion, viewReleaseUrl, createReleaseUrl);
553561
core.setOutput('release-notes', releaseNotes);
554562
} catch (error) {
555563
core.error(error);

index.js

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

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

@@ -66,15 +66,22 @@ function generateReleaseNotes(branchDiffFile, projectKeys, previousVersion, newV
6666
releaseNotes += `- ${ticketId}\n`;
6767
}
6868

69-
if (!!createReleaseUrl) {
70-
let createRelease = createReleaseUrl + "&issuelinks-linktype=releases&issuelinks-issues=DELETE";
69+
if (!!viewReleaseUrl || !!createReleaseUrl) {
70+
releaseNotes += `\n## Links\n`;
7171

72-
for (const ticketId of ticketIds) {
73-
createRelease += `&issuelinks-issues=${ticketId}`
72+
if (!!viewReleaseUrl) {
73+
releaseNotes += `- [View Release Ticket](${encodeURI(viewReleaseUrl)})`;
7474
}
7575

76-
releaseNotes += `\n## Links\n`;
77-
releaseNotes += `- [Create Release Ticket](${encodeURI(createRelease)})`;
76+
if (!!createReleaseUrl) {
77+
let createRelease = createReleaseUrl + "&issuelinks-linktype=releases&issuelinks-issues=DELETE";
78+
79+
for (const ticketId of ticketIds) {
80+
createRelease += `&issuelinks-issues=${ticketId}`
81+
}
82+
83+
releaseNotes += `- [Create Release Ticket](${encodeURI(createRelease)})`;
84+
}
7885
}
7986

8087
return releaseNotes;
@@ -86,10 +93,11 @@ async function run() {
8693
const projectKey = core.getInput('jira-project-key', {required: true});
8794
const previousVersion = core.getInput("previous-version", {required: false});
8895
const newVersion = core.getInput("new-version", {required: false});
89-
const createReleaseUrl = core.getInput('jira-url', {required: false});
96+
const viewReleaseUrl = core.getInput("jira-view-release", {required: false})
97+
const createReleaseUrl = core.getInput('jira-create-release', {required: false});
9098

9199
const releaseNotes = generateReleaseNotes(branchDiffFile, projectKey.split(","), previousVersion,
92-
newVersion, createReleaseUrl);
100+
newVersion, viewReleaseUrl, createReleaseUrl);
93101
core.setOutput('release-notes', releaseNotes);
94102
} catch (error) {
95103
core.error(error);

0 commit comments

Comments
 (0)