Skip to content

Commit 7b3e11d

Browse files
committed
Let sync workflow work with non-default branches
Currently the sync workflow checkouts always the default branch in repository, so in case where we want to sync other branch, such as `18.0-fr2`, the attempt of rebase will result in unknown branch (as it was not pulled by default to the locally cloned repository). Hence, after this commit is applied, we will perform rebase to what was explicitly fetched.
1 parent 07f3e15 commit 7b3e11d

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

.github/workflows/sync_branches_reusable_workflow.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,5 @@ jobs:
3636
run: |
3737
git fetch origin ${{ inputs.source-branch }}
3838
git checkout ${{ inputs.target-branch }}
39-
git rebase ${{ inputs.source-branch }}
39+
git rebase FETCH_HEAD
4040
git push --force origin ${{ inputs.target-branch }}

0 commit comments

Comments
 (0)