From: Don Zickus <dzickus@xxxxxxxxxx> Add tracking branches for rt-devel Without the tracking branches, the branches are created from scratch which prevent a fast-forward merge later to rt-devel and automotive-devel. Signed-off-by: Don Zickus <dzickus@xxxxxxxxxx> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index blahblah..blahblah 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -450,6 +450,10 @@ merge_rt_automotive: extends: .scheduled_setup script: - git remote add linux-rt-devel git://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-rt-devel.git + - git checkout --track origin/os-build-rt-devel && git describe + - git checkout --track origin/os-build-automotive-devel && git describe + # make sure we are on correct code base before running script + - git checkout os-build && git describe - DIST_PUSH=1 redhat/scripts/ci/ark-merge-rt.sh retry: 2 rules: -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2972 -- _______________________________________________ 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