Skip to content

Preserve contributions from a previous uprev attempt

Sergi Blanch Torné requested to merge sergi/ci-uprev:feature_new_uprev_continue_previous_if_exists into main

Each execution of ci-uprev was starting a temporary uprev branch from the default branch of the target project. When any developer wanted to contribute to the uprev proposal, their amend is forgotten in the next cycle.

So, when an uprev cycle has a dependency candidate, it checks if there is a previous proposal still open, and if it is the case, it starts from that point, and rebase to then apply the fresh dependency candidate. When there isn't a previous proposal, it behaves like before by starting the proposal from the default branch of the target project.

This required to fetch the fork when the repo object clones the target, to have the uprev branch from the fork. Moreover, the uprev procedure added a new commit as the uprev candidate. But when it is updating a previous cycle, it has to know that it must amend the old commit. This produces a limitation because the contributors to the uprev cannot add more commits, only amend the one from the cycle.

Important note: This changes assumes the uprev proposal from previous cycle has the same single commit (the changes to do the uprev and the changes in the expectations). It is not supported to contribute adding more commits. Specially if more commits are added after the uprev one made by the tool, the tool will amend the last one with the uprev changes of the current cycle.

This comment thread explains and shows a practical case of success of this proposal.

Edited by Sergi Blanch Torné

Merge request reports