fix: github action to keep auto merge prs in sync with develop - #1567
Merged
jekabs-karklins merged 2 commits intoJun 10, 2026
Merged
Conversation
added 2 commits
June 10, 2026 09:10
jekabs-karklins
changed the title
jekabs-karklins
changed the title
jekabs-karklins
marked this pull request as ready for review
June 10, 2026 07:14
jekabs-karklins
requested review from
William-Edwards-STFC
and removed request for
a team
June 10, 2026 07:14
William-Edwards-STFC
approved these changes
Jun 10, 2026
jekabs-karklins
enabled auto-merge (squash)
June 10, 2026 07:58
jekabs-karklins
deleted the
SWAP-5628-implement-scheduled-workflow-to-keep-auto-merge-pr
branch
June 10, 2026 08:28
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
This PR introduces a scheduled workflow to automatically synchronize auto-merge pull requests with the 'develop' branch.
Motivation and Context
This change is necessary to ensure that auto-merge pull requests are up-to-date with the 'develop' branch. This will make sure that if the user has marked PR as automerge the actions will the the best effort to make sure it is merged.
Changes
sync-auto-merge-prs.ymlthat runs on a schedule and finds any auto-merge PRs that are behind the 'develop' branch. It then syncs the PRs with the 'develop' branch.update-prs-with-develop.ymlthat was used for updating PRs with 'develop', which is now replaced by the new workflow.This approach allows for more automated and efficient management of pull requests, reducing manual effort and ensuring a smoother integration process.
How Has This Been Tested?
Fixes Jira Issue
https://jira.ess.eu//browse/SWAP-5628
Depends On
Tests included/Docs Updated?