Skip to content

ci: fix typo in github sync workflow #304

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 28, 2025
Merged

ci: fix typo in github sync workflow #304

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/sync-develop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,11 @@ jobs:
run: |
pr=${{ github.event.pull_request.number }}
echo "sync_branch=sync/main-into-develop-pr-${pr}" >> $GITHUB_OUTPUT
echo "title_sync=Sync main → develop (PR #${pr})" >> $GITHUB_OUTPUT
echo "body_sync=Auto-opened after merging \`${{ github.event.pull_request.head.ref }}\` into \`main\`. Source PR: #${pr}." >> $GITHUB_OUTPUT
echo "sync_title=Sync main → develop (PR #${pr})" >> $GITHUB_OUTPUT
echo "sync_body=Auto-opened after merging \`${{ github.event.pull_request.head.ref }}\` into \`main\`. Source PR: #${pr}." >> $GITHUB_OUTPUT
echo "conflict_branch=conflict/main-into-develop-pr-${pr}" >> $GITHUB_OUTPUT
echo "title_conflict=Sync main → develop (resolve conflicts)" >> $GITHUB_OUTPUT
echo "body_conflict=Opened from a copy of \`main\` so conflicts can be resolved without pushing to a protected branch." >> $GITHUB_OUTPUT
echo "conflict_title=Sync main → develop (resolve conflicts)" >> $GITHUB_OUTPUT
echo "conflict_body=Opened from a copy of \`main\` so conflicts can be resolved without pushing to a protected branch." >> $GITHUB_OUTPUT

# Short-lived sync branch from develop and merge main into it (do NOT rebase)
# use +e to stop errors from short-circuiting the script
Expand Down Expand Up @@ -151,8 +151,8 @@ jobs:
gh pr create \
--base "${BASE_BRANCH}" \
--head "${{ steps.meta.outputs.conflict_branch }}" \
--title "${{ steps.meta.outputs.title_conflict }}" \
--body "${{ steps.meta.outputs.body_conflict }}" \
--title "${{ steps.meta.outputs.conflict_title }}" \
--body "${{ steps.meta.outputs.conflict_body }}" \
--label back-merge \
--label automation \
--label conflicts
Expand Down