renovate/renovate
1
0
Fork 0
mirror of https://github.com/renovatebot/renovate.git synced 2025-01-12 06:56:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

fix: Rebase with checkedBranches isnt working as expected (#23675)

Browse source 
Co-authored-by: Michael Kriese <michael.kriese@visualon.de>
This commit is contained in:
Philip 2023-08-03 12:30:49 +03:00 committed by GitHub
parent d8bf58fbf3
commit 7f565423e6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/workers/repository/update/branch/index.ts
View file

@ -398,7 +398,7 @@ export async function processBranch(
} }
} }
const userRebaseRequested = let userRebaseRequested =
dependencyDashboardCheck === 'rebase' || dependencyDashboardCheck === 'rebase' ||
!!config.dependencyDashboardRebaseAllOpen || !!config.dependencyDashboardRebaseAllOpen ||
!!config.rebaseRequested; !!config.rebaseRequested;
@ -410,6 +410,7 @@ export async function processBranch(
} else if (dependencyDashboardCheck === 'global-config') { } else if (dependencyDashboardCheck === 'global-config') {
logger.debug(`Manual create/rebase requested via checkedBranches`); logger.debug(`Manual create/rebase requested via checkedBranches`);
config.reuseExistingBranch = false; config.reuseExistingBranch = false;
userRebaseRequested = true;
} else if (userApproveAllPendingPR) { } else if (userApproveAllPendingPR) {
logger.debug( logger.debug(
'A user manually approved all pending PRs via the Dependency Dashboard.' 'A user manually approved all pending PRs via the Dependency Dashboard.'