Skip to content

Conversation

@knmcguire
Copy link
Contributor

The CI for creating bindings fails because of this:

Fetching origin
error: Your local changes to the following files would be overwritten by checkout:
	rclrs/src/rcl_bindings_generated_rolling.rs
Please commit your changes or stash them before you switch branches.
Aborting
Switched to a new branch 'update-bindings-rolling'
[update-bindings-rolling c039255] Regenerate bindings for rolling
 1 file changed, 1 insertion(+), 1 deletion(-)
To https://github.com/ros2-rust/ros2_rust
 ! [rejected]        update-bindings-rolling -> update-bindings-rolling (non-fast-forward)
error: failed to push some refs to 'https://github.com/ros2-rust/ros2_rust'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. If you want to integrate the remote changes,
hint: use 'git pull' before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

I've added a fetch and rebase to the yml. But I might add some more improvements as well so I'll keep it in draft

@esteve
Copy link
Collaborator

esteve commented Oct 21, 2025

@knmcguire thanks. Is this ready for review or are you going to work more on it?

@knmcguire knmcguire marked this pull request as ready for review October 21, 2025 11:21
@knmcguire
Copy link
Contributor Author

@esteve if it looks good to you you can go ahead and merge. Won't have time to add any of the improvements that I had in mind but this will fix the CI issue

@maspe36 maspe36 requested review from esteve and maspe36 October 25, 2025 16:40
Copy link
Collaborator

@maspe36 maspe36 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@maspe36 maspe36 merged commit 9343141 into ros2-rust:main Oct 25, 2025
9 checks passed
@knmcguire knmcguire deleted the patch-5 branch October 26, 2025 03:32
@knmcguire
Copy link
Contributor Author

Hmmm... I don't think i fixed the issue though?

@esteve
Copy link
Collaborator

esteve commented Oct 26, 2025

@knmcguire the changes generated by the generate bindings workflow should be committed before rebasing this is the error we got:

Fetching origin
error: Your local changes to the following files would be overwritten by checkout:
	rclrs/src/rcl_bindings_generated_jazzy.rs
Please commit your changes or stash them before you switch branches.
Aborting
Switched to a new branch 'update-bindings-jazzy'
From https://github.com/ros2-rust/ros2_rust
 * branch            update-bindings-jazzy -> FETCH_HEAD
error: cannot rebase: You have unstaged changes.
error: Please commit or stash them.

@knmcguire
Copy link
Contributor Author

ahh... yes I see the issue now. Let me fix this in a new PR

@esteve
Copy link
Collaborator

esteve commented Oct 26, 2025

@knmcguire awesome, thank you 🙏

github-actions bot pushed a commit to knmcguire/ros2_rust that referenced this pull request Oct 26, 2025
github-actions bot pushed a commit to knmcguire/ros2_rust that referenced this pull request Oct 26, 2025
github-actions bot pushed a commit to knmcguire/ros2_rust that referenced this pull request Oct 26, 2025
github-actions bot pushed a commit to knmcguire/ros2_rust that referenced this pull request Oct 26, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants