Skip to content

Do not assume target branch is on the same fork as the CI #424

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
holly-cummins merged 1 commit into from
Apr 9, 2026
Merged

Do not assume target branch is on the same fork as the CI #424

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
3 changes: 2 additions & 1 deletion .github/workflows/syncbot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ jobs:

# Get the source branch name and target branch
SOURCE_BRANCH="${{ github.head_ref }}"
SOURCE_SHA="${{ github.event.pull_request.head.sha }"
TARGET_BRANCH="${{ steps.target-branch.outputs.branch }}"
SYNC_BRANCH="sync-${SOURCE_BRANCH}-to-${TARGET_BRANCH}"

Expand All @@ -55,7 +56,7 @@ jobs:
git checkout -b $SYNC_BRANCH origin/$TARGET_BRANCH

# Get all commits from the PR
COMMITS=$(git log --reverse --format="%H" origin/$TARGET_BRANCH..origin/$SOURCE_BRANCH)
COMMITS=$(git log --reverse --format="%H" origin/$TARGET_BRANCH..$SOURCE_SHA)

# Cherry-pick each commit
echo "Cherry-picking commits..."
Expand Down