Skip to content

Conversation

@kumvijaya
Copy link
Contributor

@kumvijaya kumvijaya commented Nov 4, 2025

Change summary

PR Conflict Check Workflow - Updated for Scheduled Execution and Removed mergify based check.

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.

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)
  • Migration from an old Vyatta component to vyos-1x, please link to related PR inside obsoleted component
  • Other (please describe):

Related Task(s)

https://vyos.dev/T7981

Related PR(s)

How to test / Smoketest result

Checklist:

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

@kumvijaya kumvijaya added bp/sagitta Create automatic backport for sagitta LTS version bp/circinus Create automatic backport for circinus labels Nov 4, 2025
@github-actions
Copy link

github-actions bot commented Nov 4, 2025

👍
No issues in PR Title / Commit Title

@kumvijaya kumvijaya enabled auto-merge November 21, 2025 03:35
@kumvijaya kumvijaya requested a review from dmbaturin November 21, 2025 04:57
@kumvijaya kumvijaya merged commit cae2717 into vyos:current Nov 21, 2025
6 checks passed
@vyosbot vyosbot added mirror-initiated This PR initiated for mirror sync workflow mirror-completed and removed mirror-initiated This PR initiated for mirror sync workflow labels Nov 21, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bp/circinus Create automatic backport for circinus bp/sagitta Create automatic backport for sagitta LTS version current mirror-completed rebase

Development

Successfully merging this pull request may close these issues.

4 participants