Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: merge-queue support #85

Merged
merged 6 commits into from
Dec 7, 2024
Merged

fix: merge-queue support #85

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
309bc14
use issue_number in all the places
v1v Nov 12, 2024
23e2b53
print merge-queue
v1v Nov 12, 2024
b2c9d7a
debug traces
v1v Nov 12, 2024
175b1d4
add more traces
v1v Nov 12, 2024
977d6fd
fix conditional
v1v Nov 12, 2024
db4753a
use the correct event name
v1v Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 23 additions & 19 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ async function action() {

let providedLabels = core.getInput("labels", { required: true });

core.debug(`gather labels: ${providedLabels}`);
if (labelsAreRegex) {
// If labels are regex they must be provided as new line delimited
providedLabels = providedLabels.split("\n");
Expand All @@ -43,6 +44,16 @@ async function action() {
// Remove any empty labels
providedLabels = providedLabels.filter((r) => r);

let issue_number = github.context.issue.number;

if (github.context.eventName === "merge_group") {
// Parse out of the ref for merge queue
// e.g. refs/heads/gh-readonly-queue/main/pr-17-a3c310584587d4b97c2df0cb46fe050cc46a15d6
const lastPart = github.context.ref.split("/").pop();
issue_number = lastPart.match(/pr-(\d+)-/)[1];
core.info(`merge_group event detected and issue_number parsed as ${issue_number}`);
}

const allowedModes = ["exactly", "minimum", "maximum"];
if (!allowedModes.includes(mode)) {
await exitWithError(
Expand All @@ -52,6 +63,7 @@ async function action() {
`Unknown mode input [${mode}]. Must be one of: ${allowedModes.join(
", ",
)}`,
issue_number,
);
return;
}
Expand All @@ -64,21 +76,13 @@ async function action() {
shouldAddComment,
`Unknown exit_code input [${exitType}]. Must be one of: ${allowedExitCodes.join(
", "
)}`
)}`,
issue_number,
);
return;
}

let issue_number = github.context.issue.number;

if (!issue_number && github.context.eventName == "merge_queue") {
// Parse out of the ref for merge queue
// e.g. refs/heads/gh-readonly-queue/main/pr-17-a3c310584587d4b97c2df0cb46fe050cc46a15d6
const lastPart = github.context.ref.split("/").pop();
issue_number = lastPart.match(/pr-(\d+)-/)[1];
}

// Fetch the labels using the API
core.debug(`fetch the labels for ${issue_number} using the API`);
// We use the API rather than read event.json in case earlier steps
// added a label
const labels = (
Expand Down Expand Up @@ -107,7 +111,7 @@ async function action() {
);
}

// Is there an error?
core.debug(`detect errors...`);
let errorMode;
if (mode === "exactly" && intersection.length !== count) {
errorMode = "exactly";
Expand All @@ -117,7 +121,7 @@ async function action() {
errorMode = "at most";
}

// If so, add a comment (if enabled) and fail the run
core.debug(`if so, add a comment (if enabled) and fail the run...`);
if (errorMode !== undefined) {
const comment = core.getInput("message");
const errorMessage = tmpl(comment, {
Expand All @@ -128,15 +132,15 @@ async function action() {
applied: appliedLabels.join(", "),
});

await exitWithError(exitType, octokit, shouldAddComment, errorMessage);
await exitWithError(exitType, octokit, shouldAddComment, errorMessage, issue_number);
return;
}

// Remove the comment if it exists
core.debug(`remove the comment if it exists...`);
if (shouldAddComment) {
const { data: existing } = await octokit.rest.issues.listComments({
...github.context.repo,
issue_number: github.context.issue.number,
issue_number: issue_number,
});

const generatedComment = existing.find((c) =>
Expand All @@ -163,19 +167,19 @@ function tmpl(t, o) {
});
}

async function exitWithError(exitType, octokit, shouldAddComment, message) {
async function exitWithError(exitType, octokit, shouldAddComment, message, issue_number) {
if (shouldAddComment) {
// Is there an existing comment?
const { data: existing } = await octokit.rest.issues.listComments({
...github.context.repo,
issue_number: github.context.issue.number,
issue_number: issue_number,
});

const generatedComment = existing.find((c) => c.body.includes(matchToken));

const params = {
...github.context.repo,
issue_number: github.context.issue.number,
issue_number: issue_number,
body: `${matchToken}${message}`,
};

Expand Down