From 98c3f339bf9271b3ef7d79aef30d25a6a26e3c92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= Date: Thu, 21 May 2026 11:13:30 +0200 Subject: [PATCH] Rewrite cherry-pick references during autorebases Use a custom rebasing script instead of "git rebase" to enable rewriting cherry-pick references during autorebases. --- .gitlab-ci.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 104a5fadc7..8ccc046ef8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2613,9 +2613,11 @@ merged-metadata: script: # CI job token is not sufficient for push operations - git remote get-url origin | sed -e "s/gitlab-ci-token:${CI_JOB_TOKEN}/oauth2:${BIND_TEAM_WRITE_TOKEN}/" | xargs git remote set-url --push origin - - git remote add base-project "https://oauth2:${BIND_TEAM_API_TOKEN}@gitlab.isc.org/${BASE_PROJECT}.git" - - git fetch --depth=1000 base-project "${BASE_COMMIT}" - - git rebase --rebase-merges "${BASE_COMMIT}" + - git remote add base-project "${CI_SERVER_URL}/${BASE_PROJECT}.git" + - git fetch --depth="${GIT_DEPTH}" base-project "${BASE_COMMIT}" + - *git_clone_bind9-qa + - > + "$CI_PROJECT_DIR"/bind9-qa/releng/rebase.py ${REWRITE_CHERRY_PICKS_FROM:+--rewrite-cherry-picks-from ${REWRITE_CHERRY_PICKS_FROM}} --base-project "${BASE_PROJECT}" "${BASE_COMMIT}" - *configure - meson compile -C build - git range-diff --color=always "${BASE_COMMIT}" "${CI_COMMIT_SHA}" HEAD