Update workflow to merge rel-10.4 with rel-10.3#25326
Merged
Conversation
voloagent
approved these changes
Apr 28, 2026
Contributor
There was a problem hiding this comment.
Pull request overview
Updates the GitHub Actions automation that opens a promotion PR, switching it from promoting dev into rel-10.3 to promoting rel-10.4 into rel-10.3.
Changes:
- Renamed the workflow and job to reflect
rel-10.4→rel-10.3. - Updated the checkout ref from
devtorel-10.4. - Updated the generated PR title/body to reference
rel-10.4.
Comments suppressed due to low confidence (2)
.github/workflows/auto-pr.yml:5
- The workflow name/title now indicates it merges
rel-10.4intorel-10.3, but the workflow is still triggered only on pushes torel-10.3. If the intent is to promote changes fromrel-10.4down torel-10.3, this should likely run on pushes torel-10.4(or on a schedule / manual dispatch) so newrel-10.4commits actually generate a PR.
name: Merge branch rel-10.4 with rel-10.3
on:
push:
branches:
- rel-10.3
.github/workflows/auto-pr.yml:22
- With
ref: rel-10.4followed bygit reset --hard rel-10.3, the working tree ends up atrel-10.3without ever mergingrel-10.4into it. As a result,create-pull-requestwill likely see no changes and skip creating a PR (or create an empty PR). Add an explicit merge step (e.g., mergeorigin/rel-10.4into the promotion branch based onrel-10.3), or remove the reset and configure the action to open a PR fromrel-10.4torel-10.3using thebaseinput.
ref: rel-10.4
- name: Reset promotion branch
run: |
git fetch origin rel-10.3:rel-10.3
git reset --hard rel-10.3
| title: Merge branch dev with rel-10.3 | ||
| body: This PR generated automatically to merge dev with rel-10.3. Please review the changed files before merging to prevent any errors that may occur. | ||
| title: Merge branch rel-10.4 with rel-10.3 | ||
| body: This PR generated automatically to merge rel-10.4 with rel-10.3. Please review the changed files before merging to prevent any errors that may occur. |
There was a problem hiding this comment.
Grammar: the PR body is missing “is” ("This PR is generated automatically …"). Consider fixing the sentence to improve clarity in the generated PR description.
Suggested change
| body: This PR generated automatically to merge rel-10.4 with rel-10.3. Please review the changed files before merging to prevent any errors that may occur. | |
| body: This PR is generated automatically to merge rel-10.4 with rel-10.3. Please review the changed files before merging to prevent any errors that may occur. |
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
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.
No description provided.