search

ros2 / rosbag2

Apache License 2.0
285 stars 251 forks source link

GitHub CI: broken rolling->master mirroring #1834

Closed christophebedard closed 1 month ago

christophebedard commented 1 month ago

There's a GitHub workflow that mirrors rolling to master: https://github.com/ros2/rosbag2/blob/rolling/.github/workflows/mirror-rolling-to-master.yaml. This was created when the default/Rolling branch was switched from master to rolling.

The workflow has been failing for a while: https://github.com/ros2/rosbag2/actions/runs/11312031065/job/31458961112. And master is now 177 commits behind rolling: https://github.com/ros2/rosbag2/tree/master. This is because #1247 was mistakenly merged into master instead of rolling, although it was subsequently reverted in #1248. However, since master can no longer be fast-forwarded to rolling, the mirroring action fails.

Options:

  1. Force-push rolling to master to allow the mirroring action to work again
  2. Get rid of the mirroring action
    • We could also get rid of the master branch, but we don't have to
fujitatomoya commented 1 month ago

@christophebedard

Force-push rolling to master to allow the mirroring action to work again

probably if we take this way, the other core repos should align the policy...? IMO, i don't really know why we want to keep the master branch anyway? i think it is because some CI/CD or downstream users would rely on the branch master, i guess. but with given time, i think we can remove the master now...

christophebedard commented 1 month ago

Yeah I agree, this should be a ROS 2 core-wide thing.

Having the master branch was useful for some time after the switch to allow people to transition, but I think it's probably been enough time now.

clalancette commented 1 month ago

Having the master branch was useful for some time after the switch to allow people to transition, but I think it's probably been enough time now.

So I agree that we can remove the workflow that attempts to backport things. In most cases it no longer works, and even when it does it isn't providing any value.

However, for historical purposes we should keep the master branches around.