Update workflow to merge dev with rel-10.4#25328
Conversation
There was a problem hiding this comment.
Pull request overview
Updates the .github/workflows/auto-pr.yml automation to create promotion PRs for merging dev with rel-10.4.
Changes:
- Renamed the workflow/job and updated branch naming to target
rel-10.4. - Updated checkout/reset steps to reference
devandrel-10.4. - Updated PR title/body and
ghcommands to use the new auto-merge branch path.
| - uses: actions/checkout@v2 | ||
| with: | ||
| ref: rel-10.4 | ||
| ref: dev | ||
| - name: Reset promotion branch | ||
| run: | | ||
| git fetch origin rel-10.3:rel-10.3 | ||
| git reset --hard rel-10.3 | ||
| git fetch origin rel-10.4:rel-10.4 | ||
| git reset --hard rel-10.4 |
There was a problem hiding this comment.
The workflow is named to merge dev into rel-10.4, but the steps currently check out dev and then git reset --hard rel-10.4, which effectively discards the dev tip and does not perform any merge. As a result, the created PR will not contain the intended changes (and may even produce an empty or reversed-diff PR). Update the logic to create a branch from rel-10.4 and merge origin/dev into it (and/or set the create-pull-request base to rel-10.4), ensuring checkout uses fetch-depth: 0 so the merge has the necessary history.
| name: Merge branch dev with rel-10.4 | ||
| on: | ||
| push: | ||
| branches: | ||
| - rel-10.3 | ||
| - rel-10.4 |
There was a problem hiding this comment.
The PR title/workflow name indicate merging dev with/into rel-10.4, but the workflow trigger is on.push.branches: [rel-10.4]. If the goal is to promote changes from dev into rel-10.4, this trigger will miss updates to dev and won’t run when new commits land on dev. Consider triggering on pushes to dev (or using a schedule / workflow_dispatch) so the promotion PR is created when dev changes.
No description provided.