Skip to content

T7748: conflict check workflow updated to use marketplace action along with increased wait/retry - #1025

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

T7748: conflict check workflow updated to use marketplace action along with increased wait/retry#1025
kumvijaya merged 1 commit into
vyos:currentfrom
kumvijaya:current

Conversation

@kumvijaya

@kumvijaya kumvijaya commented Sep 7, 2025

Copy link
Copy Markdown
Contributor

Change summary

The conflict check workflow was showing inconsistent behavior in detecting merge conflicts — sometimes not reporting the correct conflict status.

To improve reliability and maintainability, the workflow was updated to use a marketplace action with increased wait and retry settings. This ensures GitHub has enough time to compute the correct mergeable status before the workflow makes a decision.

Note: GitHub may return an unknown mergeable state immediately after changes in the base branch.
Without retries, this caused false negatives (reporting no conflicts when they actually existed).
By adding retries and wait intervals, the workflow should consistently report the correct status.

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

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

github-actions Bot commented Sep 7, 2025

Copy link
Copy Markdown

👍
No issues in PR Title / Commit Title

@kumvijaya kumvijaya changed the title T7748: conflict check workflow updated with increated wait/retry T7748: conflict check workflow updated with increased wait/retry Sep 7, 2025
@github-actions github-actions Bot added the current VyOS rolling release label Sep 7, 2025
@kumvijaya kumvijaya changed the title T7748: conflict check workflow updated with increased wait/retry T7748: conflict check workflow updated to use updated to marketplace action along with increased wait/retry Sep 7, 2025
@kumvijaya kumvijaya changed the title T7748: conflict check workflow updated to use updated to marketplace action along with increased wait/retry T7748: conflict check workflow updated to use marketplace action along with increased wait/retry Sep 7, 2025
@kumvijaya
kumvijaya enabled auto-merge September 8, 2025 10:08
@kumvijaya
kumvijaya merged commit 74c1f07 into vyos:current Sep 10, 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 10, 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.

4 participants