[SD-1247] Fix branch sync #401
Merged
Conversation
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
GROwen
commented
Nov 24, 2025
| git fetch origin | ||
| set +e | ||
| output=$(gh pr create --base 7.x --title "Automated PR - merge 6.x into 7.x" --body "This pull request syncs relevant changes from the 6.x branch into the 7.x branch. This PR was automatically generated by the CI workflow." --label "sync" --label "automated" 2>&1) | ||
| COMMAND_STATUS=$? |
Contributor
Author
There was a problem hiding this comment.
Capture the command status to exclude the response pull request create failed: GraphQL: No commits between 7.x and 6.x (createPullRequest) from failing the job.
| if: env.PR_NUMBER | ||
| run: | | ||
| gh pr merge temp-sync-branch --auto --merge | ||
| conflicts=$(gh pr view ${{ env.PR_NUMBER }} --json mergeStateStatus --jq 'if .mergeStateStatus == "DIRTY" then true else false end') |
Contributor
Author
There was a problem hiding this comment.
This command returns the latest PR for the currently checked out branch, 6.x in this case.
Contributor
Author
|
@nicksantamaria bump |
nicksantamaria
approved these changes
Nov 24, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Motivation
Branch sync (6.x -> 7.x) workflows were failing silently which was blocking updates (such as bumping base image versions) to the 7.x branch.
This approach inverts the previous process and relies on the internal machinations of GitHub's PR creation process to determine the status of the PR.
Switching the processing of the diff of the merge to GitHub and the github-cli tool offloads the logic for handling of the diff output to GitHub in an attempt to improve consistency and time to remediation.
Changes
This simplifies the generation of the diffs with the same result as initially intended. The previous change to the cherry-pick/merge strategy resulted in changes being lost.
Testing
GHA job https://github.com/dpc-sdp/bay/actions/runs/19446890092
Resulting PR #391