All,
Trying to solve the issues of the Proposed-8 branch.
Where we stand:
- The current version of the branch compiles, but fails many protocol
tests
- Git Bisect is currently not possible for the branch as the branch
doesn’t
compile up to the last commits (which fix previous bad commits)
I’ve started testing from the beginning of the branch and the first
approx
25 commits are all fine before the problem starts.
Completely retesting and getting every commit working would be nice, but
is probably unfeasible.
I’ve setup a test for some automated testing and merging on our
(OpenSourceRouting)
Github (github.com/opensourcerouting/quagga) to experiment with some
ideas on
how we could do some automated testing/merging of new patches in the
future.
(Using Github pull requests)
I’ve started by creating a dev/automerge branch based on master. If a
pull
request is created against this branch (only this branch), then the CI
system
will test the pull request. If it’s successful, the req will be merged
by the
CI system. (and the next pull request can be opened).
If it fails, then I’ve tried to find the later commit which has the
fixes,
updated the pull request and wait for the next test result.
I started at the beginning and cherry-picked commits from proposed 8
into a pull requests and so far got 46 commits of the 159 commits
integrated.
See
https://docs.google.com/spreadsheets/d/16UtC3epcRv6hx5dkRwPOtG3_wRVj5L5guB63g_hmw-s/edit#gid=1711194199
(The green highlighted commits are merged to the dev/automerge branch)
I think the system works, but it takes time to reorder the commits.
If someone wants to give it a try to continue finding working commits
from the remaining commits, then just fork the repo and make pull
requests against the dev/automerge branch.
If there are any issues, then just email me.
If you have better ideas then let me know. Feedback is always welcome.
- Martin Winter
_______________________________________________
Quagga-dev mailing list
[email protected]
https://lists.quagga.net/mailman/listinfo/quagga-dev
