Skip to content

Commit f7c42e3

Browse files
detect multiple project keys
1 parent bfd85ba commit f7c42e3

File tree

2 files changed

+28
-12
lines changed

2 files changed

+28
-12
lines changed

dist/index.js

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

464-
function generateReleaseNotes(branchDiffFile, projectKey, createReleaseUrl) {
464+
function generateReleaseNotes(branchDiffFile, projectKeys, createReleaseUrl) {
465465
const data = fs.readFileSync(branchDiffFile, 'utf8');
466466
const lines = data.split(/\r?\n/);
467+
468+
console.log("Project keys: " + projectKeys);
467469
console.log("Lines: " + lines.length);
468470

469-
const re = new RegExp(`${projectKey}-([0-9]*)`);
471+
const regExps = [];
472+
for (const projectKey of projectKeys) {
473+
regExps.push(new RegExp(`${projectKey}-([0-9]*)`))
474+
}
475+
470476
const tickets = {};
471477
let isFeatureChange = false;
472478

@@ -478,10 +484,12 @@ function generateReleaseNotes(branchDiffFile, projectKey, createReleaseUrl) {
478484
const words = line.trim().split(" ");
479485

480486
for (const word of words) {
481-
const r = word.trim().match(re);
487+
for (const re of regExps) {
488+
const r = word.trim().match(re);
482489

483-
if (r) {
484-
tickets[r[0]] = true;
490+
if (r) {
491+
tickets[r[0]] = true;
492+
}
485493
}
486494
}
487495
}
@@ -521,7 +529,7 @@ async function run() {
521529
const projectKey = core.getInput('jira-project-key', {required: true});
522530
const createReleaseUrl = core.getInput('jira-url', {required: false});
523531

524-
const releaseNotes = generateReleaseNotes(branchDiffFile, projectKey, createReleaseUrl);
532+
const releaseNotes = generateReleaseNotes(branchDiffFile, projectKey.split(","), createReleaseUrl);
525533
core.setOutput('release-notes', releaseNotes);
526534
} catch (error) {
527535
core.error(error);

index.js

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

4-
function generateReleaseNotes(branchDiffFile, projectKey, createReleaseUrl) {
4+
function generateReleaseNotes(branchDiffFile, projectKeys, createReleaseUrl) {
55
const data = fs.readFileSync(branchDiffFile, 'utf8');
66
const lines = data.split(/\r?\n/);
7+
8+
console.log("Project keys: " + projectKeys);
79
console.log("Lines: " + lines.length);
810

9-
const re = new RegExp(`${projectKey}-([0-9]*)`);
11+
const regExps = [];
12+
for (const projectKey of projectKeys) {
13+
regExps.push(new RegExp(`${projectKey}-([0-9]*)`))
14+
}
15+
1016
const tickets = {};
1117
let isFeatureChange = false;
1218

@@ -18,10 +24,12 @@ function generateReleaseNotes(branchDiffFile, projectKey, createReleaseUrl) {
1824
const words = line.trim().split(" ");
1925

2026
for (const word of words) {
21-
const r = word.trim().match(re);
27+
for (const re of regExps) {
28+
const r = word.trim().match(re);
2229

23-
if (r) {
24-
tickets[r[0]] = true;
30+
if (r) {
31+
tickets[r[0]] = true;
32+
}
2533
}
2634
}
2735
}
@@ -61,7 +69,7 @@ async function run() {
6169
const projectKey = core.getInput('jira-project-key', {required: true});
6270
const createReleaseUrl = core.getInput('jira-url', {required: false});
6371

64-
const releaseNotes = generateReleaseNotes(branchDiffFile, projectKey, createReleaseUrl);
72+
const releaseNotes = generateReleaseNotes(branchDiffFile, projectKey.split(","), createReleaseUrl);
6573
core.setOutput('release-notes', releaseNotes);
6674
} catch (error) {
6775
core.error(error);

0 commit comments

Comments
 (0)