Skip to content

T7878: Using mergify rule to handle conflict checks for private repo - #1047

Merged
kumvijaya merged 1 commit into
vyos:currentfrom
kumvijaya:current
Sep 29, 2025
Merged

T7878: Using mergify rule to handle conflict checks for private repo#1047
kumvijaya merged 1 commit into
vyos:currentfrom
kumvijaya:current

Conversation

@kumvijaya

@kumvijaya kumvijaya commented Sep 27, 2025

Copy link
Copy Markdown
Contributor

Change summary

Using a Mergify rule to handle conflict checks for a private repository.
Observed that Mergify detects conflicts more accurately and is more reliable compared to a custom action.

Note:
It is only for private repo., public repo will continue to use github workflow.

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/T7878

Related PR(s)

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

@github-actions

Copy link
Copy Markdown

👍
No issues in PR Title / Commit Title

@github-actions github-actions Bot added the current VyOS rolling release label Sep 27, 2025
@kumvijaya
kumvijaya enabled auto-merge September 27, 2025 18:20

@dmbaturin dmbaturin left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I have no objections against the change.

Just a note: please do not use https://vyos.dev/T6707 as a parent for these tasks. This isn't even related to the release workflow at all. Those tasks should also have better (at the very least, non-empty) descriptions to make it clear what exactly is being done and why.

@kumvijaya
kumvijaya merged commit 3f36fe9 into vyos:current Sep 29, 2025
8 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 Sep 29, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

current VyOS rolling release mirror-completed

Development

Successfully merging this pull request may close these issues.

5 participants