Skip to content

UPdated the merge conflict notifier #2080

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

Open
Ayush4958 wants to merge 1 commit into
base: main
Choose a base branch
from
+3 −3
Open

UPdated the merge conflict notifier #2080

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions .github/workflows/conflict-notifier.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ jobs:
});
}

// Check existing comments to enforce a 2-hour notification gap
// Check existing comments to enforce a 24-hour notification gap
const { data: comments } = await github.rest.issues.listComments({
owner: context.repo.owner,
repo: context.repo.repo,
Expand All @@ -101,8 +101,8 @@ jobs:
const lastComment = conflictComments[conflictComments.length - 1];
const lastCommentTime = new Date(lastComment.created_at).getTime();
const nowTime = new Date().getTime();
const TWO_HOURS_MS = 2 * 60 * 60 * 1000;
if (nowTime - lastCommentTime >= TWO_HOURS_MS) {
const TWENTY_FOUR_HOURS_MS = 24 * 60 * 60 * 1000;
if (nowTime - lastCommentTime >= TWENTY_FOUR_HOURS_MS) {
shouldComment = true;
}
}
Expand Down
Loading