From: Don Zickus on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2969 The nightly rt merging cronjob immediately failed the second night because I forgot to push the intermediary branch rt-automated-devel. So when it got rebuilt the next night from scratch it got merged into rt-devel and automotive-devel in a way that required those branches to be forced pushed. Not good for development. The easy way is to push that branch but that requires re-pushing rt-devel and automotive-devel. Not hard. Instead I wanted to remove that intermediary branch leaving less complicated logic and rely on an octopus merge. Should work better now and simpler to read. Signed-off-by: Don Zickus dzickus@xxxxxxxxxx --- redhat/scripts/ci/ark-ci-env.sh | 19 ++++---- redhat/scripts/ci/ark-merge-rt.sh | 81 ++++++++++++++++---------------------- 2 files changed, 45 insertions(+), 55 deletions(-) -- _______________________________________________ kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/kernel@xxxxxxxxxxxxxxxxxxxxxxx Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
