search

ansible / ansible-documentation

Ansible community documentation
https://docs.ansible.com/
GNU General Public License v3.0
80 stars 464 forks source link

Create separate scheduled jobs to update dev dependencies for each branch #1450

Closed gotmax23 closed 1 month ago

gotmax23 commented 4 months ago

See https://github.com/ansible/ansible-documentation/blob/devel/.github/workflows/pip-compile-dev.yml

gotmax23 commented 4 months ago

Alternatively, we can fix the requirements inputs to make sure they're the same across branches. This got messed up when we added the tagger script to only the devel branch. We really only should have the tag script on the devel branch, but I guess it's fine to keep it synced to make this easier.

oraNod commented 4 months ago

Hey @gotmax23 thanks for adding this. I see the tagger script is on devel and stable-2.17 but none of the other branches. Likewise the pip-compile-dev is on devel and a couple of the stable branches but not all. So, yeah, maybe the branches are getting a bit inconsistent. FWIW, my preference would be to keep the tagger on devel only. That makes sense. It's probably also my fault that it got on to stable-2.17 in the first place as I created that branch...

Anyway can you explain this issue a bit more please? I'd like to make sure I fully understand why we need separate scheduled jobs instead of the job that runs on devel then backports to stable branches to sync changes. Thank you.

gotmax23 commented 4 months ago

The issue is that we can no longer directly backport the devel PRs using the backport bot due to conflicts, so we need to either resolve the conflicts (sync the requirements files for the tag script to stable branches and update tests/typing.in) or create separate PRs for the stable branches.

oraNod commented 4 months ago

The issue is that we can no longer directly backport the devel PRs using the backport bot due to conflicts, so we need to either resolve the conflicts (sync the requirements files for the tag script to stable branches and update tests/typing.in) or create separate PRs for the stable branches.

@gotmax23 Thanks for clarifying. I ran into this yesterday with https://github.com/ansible/ansible-documentation/pull/1477