Skip to content

Comments

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

Merged
sever-sever merged 2 commits intovyos:currentfrom
kumvijaya:current
Sep 10, 2025
Merged

T7748: conflict check workflow updated to use marketplace action along with increased wait/retry#18
sever-sever merged 2 commits intovyos:currentfrom
kumvijaya:current

Conversation

@kumvijaya
Copy link
Contributor

@kumvijaya kumvijaya commented Sep 8, 2025

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)
  • Other (please describe):

Related Task(s)

https://vyos.dev/T7748

Related PR(s)

Component(s) name

Proposed changes

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

@github-actions
Copy link

github-actions bot commented Sep 8, 2025

👍
No issues in PR Title / Commit Title

@kumvijaya kumvijaya requested a review from c-po September 8, 2025 18:12
@kumvijaya kumvijaya changed the title T7748: conflict check workflow updated to use marketplace action alon… T7748: conflict check workflow updated to use marketplace action along with increased wait/retry Sep 8, 2025
@sever-sever sever-sever merged commit df14155 into vyos:current Sep 10, 2025
6 of 7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Development

Successfully merging this pull request may close these issues.

3 participants