Skip to content

Commit c35ef13

Browse files
authored
ci: fix typo in github sync workflow (#304)
1 parent cc9bc3d commit c35ef13

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

.github/workflows/sync-develop.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,11 @@ jobs:
6767
run: |
6868
pr=${{ github.event.pull_request.number }}
6969
echo "sync_branch=sync/main-into-develop-pr-${pr}" >> $GITHUB_OUTPUT
70-
echo "title_sync=Sync main → develop (PR #${pr})" >> $GITHUB_OUTPUT
71-
echo "body_sync=Auto-opened after merging \`${{ github.event.pull_request.head.ref }}\` into \`main\`. Source PR: #${pr}." >> $GITHUB_OUTPUT
70+
echo "sync_title=Sync main → develop (PR #${pr})" >> $GITHUB_OUTPUT
71+
echo "sync_body=Auto-opened after merging \`${{ github.event.pull_request.head.ref }}\` into \`main\`. Source PR: #${pr}." >> $GITHUB_OUTPUT
7272
echo "conflict_branch=conflict/main-into-develop-pr-${pr}" >> $GITHUB_OUTPUT
73-
echo "title_conflict=Sync main → develop (resolve conflicts)" >> $GITHUB_OUTPUT
74-
echo "body_conflict=Opened from a copy of \`main\` so conflicts can be resolved without pushing to a protected branch." >> $GITHUB_OUTPUT
73+
echo "conflict_title=Sync main → develop (resolve conflicts)" >> $GITHUB_OUTPUT
74+
echo "conflict_body=Opened from a copy of \`main\` so conflicts can be resolved without pushing to a protected branch." >> $GITHUB_OUTPUT
7575
7676
# Short-lived sync branch from develop and merge main into it (do NOT rebase)
7777
# use +e to stop errors from short-circuiting the script
@@ -151,8 +151,8 @@ jobs:
151151
gh pr create \
152152
--base "${BASE_BRANCH}" \
153153
--head "${{ steps.meta.outputs.conflict_branch }}" \
154-
--title "${{ steps.meta.outputs.title_conflict }}" \
155-
--body "${{ steps.meta.outputs.body_conflict }}" \
154+
--title "${{ steps.meta.outputs.conflict_title }}" \
155+
--body "${{ steps.meta.outputs.conflict_body }}" \
156156
--label back-merge \
157157
--label automation \
158158
--label conflicts

0 commit comments

Comments
 (0)