upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-15 01:10:05 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rewrite cherry-pick references during autorebases

Browse source 
Use a custom rebasing script instead of "git rebase" to enable rewriting
cherry-pick references during autorebases.
This commit is contained in:
Michał Kępień 2026-05-21 11:13:30 +02:00
parent 5c8637debe
commit 98c3f339bf
No known key found for this signature in database
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.gitlab-ci.yml
View file

@ -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