Update workflow to merge rel-10.3 with rel-10.2#25183
Merged
Merged
Conversation
voloagent
approved these changes
Mar 31, 2026
Contributor
There was a problem hiding this comment.
Pull request overview
Updates the auto PR GitHub Actions workflow metadata to promote changes from rel-10.3 into rel-10.2.
Changes:
- Renamed the workflow and job to reference
rel-10.3→rel-10.2. - Switched the checkout ref from
devtorel-10.3. - Updated the generated PR title/body to reference
rel-10.3.
Comments suppressed due to low confidence (2)
.github/workflows/auto-pr.yml:22
- The checkout+reset sequence discards the source branch content: you check out
rel-10.3and thengit reset --hard rel-10.2, leaving the workspace identical torel-10.2(so the PR will be empty / not actually mergerel-10.3intorel-10.2). To create a promotion PR, check out the target branch (rel-10.2) and merge inrel-10.3(or configurecreate-pull-requestwithbase: rel-10.2andhead: rel-10.3without resetting).
ref: rel-10.3
- name: Reset promotion branch
run: |
git fetch origin rel-10.2:rel-10.2
git reset --hard rel-10.2
.github/workflows/auto-pr.yml:35
- The merge step uses
gh pr readywithout specifying which PR/branch; in GitHub Actions this often fails because the current checked-out branch isn’t the newly createdauto-merge/...branch. Use the outputs from thecreate-pull-requeststep (e.g., PR number/URL) and pass that togh pr ready/review/mergeto ensure the commands operate on the intended PR.
- name: Merge Pull Request
env:
GH_TOKEN: ${{ secrets.BOT_SECRET }}
run: |
gh pr ready
| @@ -24,8 +24,8 @@ jobs: | |||
| uses: peter-evans/create-pull-request@v3 | |||
| with: | |||
| branch: auto-merge/rel-10-2/${{github.run_number}} | |||
There was a problem hiding this comment.
peter-evans/create-pull-request will target the currently checked-out branch unless base is specified. Given the goal is to merge into rel-10.2, set base: rel-10.2 explicitly; otherwise the PR may target rel-10.3 (or another branch depending on the checkout state).
Suggested change
| branch: auto-merge/rel-10-2/${{github.run_number}} | |
| branch: auto-merge/rel-10-2/${{github.run_number}} | |
| base: rel-10.2 |
| title: Merge branch dev with rel-10.2 | ||
| body: This PR generated automatically to merge dev with rel-10.2. Please review the changed files before merging to prevent any errors that may occur. | ||
| title: Merge branch rel-10.3 with rel-10.2 | ||
| body: This PR generated automatically to merge rel-10.3 with rel-10.2. Please review the changed files before merging to prevent any errors that may occur. |
There was a problem hiding this comment.
The PR body text is missing a verb (“This PR generated automatically …”). Consider updating to “This PR is generated automatically …” for correct grammar.
Suggested change
| body: This PR generated automatically to merge rel-10.3 with rel-10.2. Please review the changed files before merging to prevent any errors that may occur. | |
| body: This PR was generated automatically to merge rel-10.3 with rel-10.2. 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.