Skip to content

fix(check-merge-safety): Keep failure description short on comment matches, add target_url to failure statuses #781

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

Merged
avwu99 merged 4 commits into from
Apr 23, 2026
Merged

fix(check-merge-safety): Keep failure description short on comment matches, add target_url to failure statuses #781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
51975e4
Keep description short, add target_url to failure statuses
Apr 23, 2026
362dd58
set target_url for success and failures
Apr 23, 2026
c82ec1c
Merge branch 'main' into auwu/fix-description
avwu99 Apr 23, 2026
ebd3831
chore: committing generated dist
avwu99 Apr 23, 2026
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
8 changes: 4 additions & 4 deletions dist/helpers/check-merge-safety.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ var import_bluebird = __toESM(require_bluebird(), 1);
var git = simpleGit();
var maxBranchNameLength = 50;
var COMMENT_PATHS_MARKER = "<!-- check-merge-safety-paths -->";
var getWorkflowRunUrl = () => `${context.serverUrl}/${context.repo.owner}/${context.repo.repo}/actions/runs/${context.runId}`;

class CheckMergeSafety extends HelperInputs {
}
Expand Down Expand Up @@ -74,6 +75,7 @@ var setMergeSafetyStatus = async (pullRequest, { context: context2 = "Merge Safe
state,
context: context2,
description: message,
target_url: getWorkflowRunUrl(),
...context.repo
});
}
Expand Down Expand Up @@ -175,11 +177,9 @@ var getMergeSafetyStateAndMessage = async (pullRequest, { paths, ignore_globs, o
const outdatedCommentPaths = commentPaths.filter((commentPath) => fileNamesWhichBranchIsBehindOn.some((file) => file.startsWith(commentPath + "/") || file === commentPath));
if (outdatedCommentPaths.length) {
error(buildErrorMessage(outdatedCommentPaths, "comment paths", truncatedBranchName));
const displayPaths = outdatedCommentPaths.slice(0, 3).join(", ");
const suffix = outdatedCommentPaths.length > 3 ? "..." : "";
return {
state: "failure",
message: `Branch is behind on paths from comment: ${displayPaths}${suffix}. Please update with ${default_branch}.`
message: `Branch is behind on ${outdatedCommentPaths.length} path(s) from comment. Please update with ${default_branch}.`
};
}
} else {
Expand Down Expand Up @@ -259,4 +259,4 @@ export {
CheckMergeSafety
};

//# debugId=F4EC41763AC4ABEC64756E2164756E21
//# debugId=41C4FA0898BE964F64756E2164756E21
Loading
Loading