Skip to content

Commit 305843d

Browse files
knmcguireactions-user
authored andcommitted
Fix rebase order in generate-bindings workflow (#541)
1 parent 2a3fc69 commit 305843d

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

.github/workflows/generate-bindings.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,10 @@ jobs:
9999
CREATE_PR=1
100100
git checkout -b update-bindings-${{ matrix.ros_distribution }}
101101
fi
102-
git fetch origin update-bindings-${{ matrix.ros_distribution }}
103-
git rebase origin/update-bindings-${{ matrix.ros_distribution }}
104102
git add rclrs/src/rcl_bindings_generated_${{ matrix.ros_distribution }}.rs
105103
git commit -m "Regenerate bindings for ${{ matrix.ros_distribution }}"
104+
git fetch origin update-bindings-${{ matrix.ros_distribution }}
105+
git rebase origin/update-bindings-${{ matrix.ros_distribution }}
106106
git push -u origin update-bindings-${{ matrix.ros_distribution }}
107107
if [ $CREATE_PR -eq 1 ]; then
108108
gh pr create --base main --head update-bindings-${{ matrix.ros_distribution }} --title "Regenerate bindings for ${{ matrix.ros_distribution }}" --body "This PR regenerates the bindings for ${{ matrix.ros_distribution }}."

0 commit comments

Comments
 (0)