ros-industrial / kuka_experimental

Experimental packages for KUKA manipulators within ROS-Industrial (http://wiki.ros.org/kuka_experimental)
Apache License 2.0
264 stars 212 forks source link

Switch to using GitHub actions #197

Closed simonschmeisser closed 2 years ago

simonschmeisser commented 2 years ago

This was based on the respective changes in the fanuc repository

gavanderhoorn commented 2 years ago

Thanks for the PR. Have you run this on your fork?

I would expect catkin_lint to not be too happy fi.

simonschmeisser commented 2 years ago

I just figured out how to run this manually, let's see what results we get. Would you prefer (temporarily) disabling catkin_lint or fixing it within this PR?

gavanderhoorn commented 2 years ago

I would suggest to tackle one thing at a time (so not enable catkin_lint just yet).

gavanderhoorn commented 2 years ago

Looks like this passes now:

gavanderhoorn commented 2 years ago

Feel free to merge @simonschmeisser :+1:

Let's not squash merge this so as to preserve the separate commits.

gavanderhoorn commented 2 years ago

@simonschmeisser: don't forget to re-enable branch protection again after this is merged and require the GHA status check.

If you enable to admin-exception, you should still be able to merge PRs which don't have it.

simonschmeisser commented 2 years ago

Thanks for the quick review! Am I correct in assuming that "Rebase and Merge" is prefered over "Create a merge commit"?

You already disabled branch protection right?

gavanderhoorn commented 2 years ago

Am I correct in assuming that "Rebase and Merge" is prefered over "Create a merge commit"?

I'd suggest to use regular merges whenever possible. That way provenance of commits is retained as much as possible and we don't really see that much PRs here to warrant going for rebases by default.

If / when it makes sense, rebases can be used.

You already disabled branch protection right?

To be able to merge this one, yes.

simonschmeisser commented 2 years ago

Sorry, you were too quick ... but now the commits are clean

gavanderhoorn commented 2 years ago

Thanks :+1:

I've kicked off the actions.

simonschmeisser commented 2 years ago

I either cannot find the branch protection settings or lack the privileges to see/change them

gavanderhoorn commented 2 years ago

Mentioning https://github.com/ros-industrial/ros_industrial_issues/issues/74 here so we keep things connected.