Skip to content

Commit 8818b97

Browse files
committed
oops fix it
1 parent 1700846 commit 8818b97

File tree

1 file changed

+28
-35
lines changed
  • dev-packages/release-comment-issues-gh-action

1 file changed

+28
-35
lines changed

dev-packages/release-comment-issues-gh-action/index.mjs

Lines changed: 28 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -35,34 +35,20 @@ async function run() {
3535

3636
core.debug(`Found PRs in release body: ${prNumbers.join(', ')}`);
3737

38+
const linkedIssues = Promise.all(prNumbers.map((prNumber) => getLinkedIssuesForPr(octokit, { repo, owner, prNumber })));
3839

39-
const res = await octokit.graphql(`
40-
{
41-
query issuesForPr($owner: String!, $repo: String!, $prNumber: Int!) {
42-
repository(owner: $owner, name: $repo) {
43-
pullRequest(number: $prNumber) {
44-
id
45-
closingIssuesReferences (first: 50) {
46-
edges {
47-
node {
48-
id
49-
number
50-
}
51-
}
52-
}
53-
}
54-
}
55-
}
40+
console.log(linkedIssues);
41+
42+
for(const pr of linkedIssues) {
43+
if(!pr.issues.length) {
44+
core.debug(`No linked issues found for PR #${pr.prNumber}`);
45+
continue;
5646
}
57-
`, {
58-
prNumber: prNumbers[0],
59-
owner,
60-
repo
61-
});
6247

63-
const linkedIssues = Promise.all(prNumbers.map((prNumber) => getLinkedIssuesForPr(octokit, { repo, owner, prNumber })));
48+
core.debug(`Linked issues for PR #${pr.prNumber}: ${pr.issues.map(issue => issue.number).join(',')}`);
49+
}
50+
6451

65-
console.log(linkedIssues);
6652
}
6753

6854
/**
@@ -75,16 +61,15 @@ function extractPrsFromReleaseBody(body) {
7561
const prNumbers = Array.from(new Set([...body.matchAll(regex)].map((match) => parseInt(match[1]))));
7662

7763
return prNumbers.filter(number => !!number && !Number.isNaN(number));
78-
}
79-
80-
/**
64+
}/**
8165
*
8266
* @param {ReturnType<import('@actions/github').getOctokit>} octokit
8367
* @param {{ repo: string, owner: string, prNumber: number}} options
84-
* @returns {Promise<{id: string, number: number}[]>}
68+
* @returns {Promise<{ prNumber: number, issues: {id: string, number: number}[] }>}
8569
*/
8670
async function getLinkedIssuesForPr(octokit, { repo, owner, prNumber }) {
87-
const res = await octokit.graphql(`
71+
const res = await octokit.graphql(
72+
`
8873
query issuesForPr($owner: String!, $repo: String!, $prNumber: Int!) {
8974
repository(owner: $owner, name: $repo) {
9075
pullRequest(number: $prNumber) {
@@ -99,13 +84,21 @@ query issuesForPr($owner: String!, $repo: String!, $prNumber: Int!) {
9984
}
10085
}
10186
}
102-
}`, {
103-
prNumber,
104-
owner,
105-
repo
106-
});
87+
}`,
88+
{
89+
prNumber,
90+
owner,
91+
repo,
92+
},
93+
);
10794

108-
return res.data.repository?.pullRequest?.closingIssuesReferences.edges.map(edge => edge.node);
95+
console.log(res);
96+
97+
const issues = res.data.repository?.pullRequest?.closingIssuesReferences.edges.map(edge => edge.node);
98+
return {
99+
prNumber,
100+
issues
101+
};
109102
}
110103

111104
run();

0 commit comments

Comments
 (0)