Skip to content

Conversation

@kumvijaya
Copy link
Contributor

@kumvijaya kumvijaya commented Nov 3, 2025

Change Summary

PR Conflict Check Workflow - Updated for Scheduled Execution

Enhanced the PR conflict checking workflow to support scheduled and manual triggers, addressing the issue where GitHub's mergeable state is unreliable immediately after commits.

The scheduled approach will help to solve the issue where immediate post-commit checks don't provide accurate merge status, ensuring comprehensive and reliable conflict detection.

Note:
Corresponding caller workflows will be added in subsequent PRs, with both schedule and workflow-dispatch triggers.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Code style update (formatting, renaming)
  • Refactoring (no functional changes)
  • Other (please describe):

Related Task(s)

Related PR(s)

Proposed changes

How to test

Checklist:

  • I have read the CONTRIBUTING document
  • I have linked this PR to one or more Phabricator Task(s)
  • My commit headlines contain a valid Task id
  • My change requires a change to the documentation
  • I have updated the documentation accordingly

Copy link
Member

@dmbaturin dmbaturin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have reservations about scripts embedded in YAML. They are hard to execute and debug separately, or run through linters and other tools. Can we move it to a file and call it from there?

@sever-sever sever-sever requested a review from Copilot November 5, 2025 11:28
Copy link

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot encountered an error and was unable to review this pull request. You can try again by re-requesting a review.

@kumvijaya kumvijaya requested a review from dmbaturin November 5, 2025 18:56
@kumvijaya
Copy link
Contributor Author

kumvijaya commented Nov 5, 2025

I have reservations about scripts embedded in YAML. They are hard to execute and debug separately, or run through linters and other tools. Can we move it to a file and call it from there?

@dmbaturin Created typescript (js) action and script code taken out from workflow

@sever-sever sever-sever requested a review from Copilot November 6, 2025 07:47
@sever-sever
Copy link
Member

Can you squash 23 commits to some logical sequence?
There’re should be either 1 commit or some logical separation like ;

  • update flow, use xxx instead of xxy
  • Use JS for xxx
  • Use TS for xxx

otherwise it will be not good for commit history

Copy link

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot encountered an error and was unable to review this pull request. You can try again by re-requesting a review.

@kumvijaya kumvijaya force-pushed the T7981-conflict-check-scheduled-workflow branch 6 times, most recently from 2bdca7e to 81c0755 Compare November 6, 2025 12:22
T7981: created scheduling capable reusable workflow for conflict check

T7981: created scheduling capable reusable workflow for conflict check

T7981: created scheduling capable reusable workflow for conflict check

T7981: created scheduling capable reusable workflow for conflict check

T7961: conflict label check workflow updated

T7981: conflict check updates

T7981: conflict check updates

T7981: conflict check updates

T7981: conflict check updates

T7981: conflict-check-scheduled-workflow updated to use custom js action

T7981: conflict-check-scheduled-workflow updated to use custom js action

T7981: conflict-check-scheduled-workflow updated to use custom js action

T7981: conflict-check-scheduled-workflow updated to use custom js action

T7981: conflict-check-scheduled-workflow updated to use custom js action

T7981: conflict-check-scheduled-workflow updated to use custom js action

T7981: conflict-check-scheduled-workflow updated to use custom ts action

T7981: conflict-check-scheduled-workflow updated to use custom ts action

T7981: conflict-check-scheduled-workflow updated to use custom ts action

T7981: conflict-check-scheduled-workflow updated to use custom ts action

T7981: conflict-check-scheduled-workflow updated to use custom ts action

T7981: conflict-check-scheduled-workflow updated to use custom ts action

T7981: conflict-check-scheduled-workflow updated to use custom ts action
@kumvijaya kumvijaya force-pushed the T7981-conflict-check-scheduled-workflow branch from 81c0755 to ee45f32 Compare November 6, 2025 12:24
@kumvijaya
Copy link
Contributor Author

Can you squash 23 commits to some logical sequence? There’re should be either 1 commit or some logical separation like ;

  • update flow, use xxx instead of xxy
  • Use JS for xxx
  • Use TS for xxx

otherwise it will be not good for commit history

Done

@kumvijaya kumvijaya closed this Nov 18, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

4 participants