From f1e7c6057bc0d39977fb0b897ead5929fd0c4e8c Mon Sep 17 00:00:00 2001 From: "Kimberly N. McGuire" Date: Sun, 26 Oct 2025 16:45:38 +0800 Subject: [PATCH] Fix rebase order in generate-bindings workflow --- .github/workflows/generate-bindings.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/generate-bindings.yml b/.github/workflows/generate-bindings.yml index d19566dd..b3a712eb 100644 --- a/.github/workflows/generate-bindings.yml +++ b/.github/workflows/generate-bindings.yml @@ -99,10 +99,10 @@ jobs: CREATE_PR=1 git checkout -b update-bindings-${{ matrix.ros_distribution }} fi - git fetch origin update-bindings-${{ matrix.ros_distribution }} - git rebase origin/update-bindings-${{ matrix.ros_distribution }} git add rclrs/src/rcl_bindings_generated_${{ matrix.ros_distribution }}.rs git commit -m "Regenerate bindings for ${{ matrix.ros_distribution }}" + git fetch origin update-bindings-${{ matrix.ros_distribution }} + git rebase origin/update-bindings-${{ matrix.ros_distribution }} git push -u origin update-bindings-${{ matrix.ros_distribution }} if [ $CREATE_PR -eq 1 ]; then 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 }}."