diff --git a/lib/platform/azure/index.ts b/lib/platform/azure/index.ts index 2248bc4bdad713ae78036977ab921cf1389124b2..1c500fc994cef4b26b7622e2dd50428f6ddfa1c1 100644 --- a/lib/platform/azure/index.ts +++ b/lib/platform/azure/index.ts @@ -40,7 +40,6 @@ import { AzurePr } from './types'; interface Config { repoForceRebase: boolean; mergeMethod: GitPullRequestMergeStrategy; - baseBranch: string; defaultBranch: string; owner: string; repoId: string; @@ -118,7 +117,6 @@ export async function initRepo({ logger.debug(`${repository} owner = ${config.owner}`); // Use default branch as PR target unless later overridden config.defaultBranch = repo.defaultBranch.replace('refs/heads/', ''); - config.baseBranch = config.defaultBranch; logger.debug(`${repository} default branch = ${config.defaultBranch}`); config.mergeMethod = await azureHelper.getMergeMethod(repo.id, names.project); config.repoForceRebase = false; @@ -173,8 +171,7 @@ export function getRepoForceRebase(): Promise<boolean> { // istanbul ignore next export async function setBaseBranch(branchName: string): Promise<string> { - logger.debug(`Setting baseBranch to ${branchName}`); - config.baseBranch = branchName; + logger.debug(`Setting base branch to ${branchName}`); const baseBranchSha = await git.setBranch(branchName); return baseBranchSha; } diff --git a/lib/platform/bitbucket-server/index.ts b/lib/platform/bitbucket-server/index.ts index af0e4ba40f779b452db44d7a8cbe30584d22b2b5..813e9ee45b0a58c1c597beb142a27e86684890e4 100644 --- a/lib/platform/bitbucket-server/index.ts +++ b/lib/platform/bitbucket-server/index.ts @@ -201,7 +201,6 @@ export async function initRepo({ `./rest/api/1.0/projects/${config.projectKey}/repos/${config.repositorySlug}/branches/default` ) ).body.displayId; - config.baseBranch = config.defaultBranch; config.mergeMethod = 'merge'; const repoConfig: RepoConfig = { defaultBranch: config.defaultBranch, @@ -240,7 +239,6 @@ export async function getRepoForceRebase(): Promise<boolean> { } export async function setBaseBranch(branchName: string): Promise<string> { - config.baseBranch = branchName; const baseBranchSha = await git.setBranch(branchName); return baseBranchSha; } diff --git a/lib/platform/bitbucket-server/types.ts b/lib/platform/bitbucket-server/types.ts index e319775cd41e0fcae9e9e69c17fe215f16093e23..9acf631ef9264e2c8b8ead08496af6095a50bd27 100644 --- a/lib/platform/bitbucket-server/types.ts +++ b/lib/platform/bitbucket-server/types.ts @@ -1,7 +1,6 @@ import { Pr } from '../common'; export interface BbsConfig { - baseBranch: string; bbUseDefaultReviewers: boolean; defaultBranch: string; fileList: any[]; diff --git a/lib/platform/bitbucket/index.ts b/lib/platform/bitbucket/index.ts index fc548e9b46e397eedd46f97a66dd0f29e5ff3f4b..7b6583568e0f88ff3848352c10ce2f97a912043c 100644 --- a/lib/platform/bitbucket/index.ts +++ b/lib/platform/bitbucket/index.ts @@ -126,7 +126,6 @@ export async function initRepo({ Object.assign(config, { owner: info.owner, defaultBranch: info.mainbranch, - baseBranch: info.mainbranch, mergeMethod: info.mergeMethod, has_issues: info.has_issues, }); @@ -175,8 +174,6 @@ export function getRepoForceRebase(): Promise<boolean> { } export async function setBaseBranch(branchName: string): Promise<string> { - logger.debug(`Setting baseBranch to ${branchName}`); - config.baseBranch = branchName; const baseBranchSha = await git.setBranch(branchName); return baseBranchSha; } diff --git a/lib/platform/bitbucket/utils.ts b/lib/platform/bitbucket/utils.ts index 4578ed5d6e6a2f34430f0067d408191d51060193..188bbbed0c58a772af2796a226c9c3ee2e289d6d 100644 --- a/lib/platform/bitbucket/utils.ts +++ b/lib/platform/bitbucket/utils.ts @@ -8,7 +8,6 @@ import { Pr } from '../common'; const bitbucketHttp = new BitbucketHttp(); export interface Config { - baseBranch: string; defaultBranch: string; has_issues: boolean; mergeMethod: string; diff --git a/lib/platform/gitea/index.ts b/lib/platform/gitea/index.ts index ab0f130d084681eb97f0d90a0e4c3001b4a8d2c5..b38845c870135ace19026552950de6d9d886e2f8 100644 --- a/lib/platform/gitea/index.ts +++ b/lib/platform/gitea/index.ts @@ -47,7 +47,6 @@ interface GiteaRepoConfig { repository: string; localDir: string; defaultBranch: string; - baseBranch: string; mergeMethod: helper.PRMergeMethod; prList: Promise<Pr[]> | null; @@ -280,8 +279,7 @@ const platform: Platform = { // Determine author email and branches config.defaultBranch = repo.default_branch; - config.baseBranch = config.defaultBranch; - logger.debug(`${repository} default branch = ${config.baseBranch}`); + logger.debug(`${repository} default branch = ${config.defaultBranch}`); // Optionally check if Renovate is disabled by attempting to fetch default configuration file if (optimizeForDisabled) { @@ -421,9 +419,8 @@ const platform: Platform = { return BranchStatus.yellow; }, - async setBaseBranch(baseBranch: string): Promise<string> { - config.baseBranch = baseBranch; - const baseBranchSha = await git.setBranch(baseBranch); + async setBaseBranch(branchName: string): Promise<string> { + const baseBranchSha = await git.setBranch(branchName); return baseBranchSha; }, diff --git a/lib/platform/github/index.ts b/lib/platform/github/index.ts index 6f42a5bfee9882163bc1772eb2edb26742914933..8d1b2c0be59f19dcf3db664d2a9a21e609484fe3 100644 --- a/lib/platform/github/index.ts +++ b/lib/platform/github/index.ts @@ -274,8 +274,7 @@ export async function initRepo({ // Use default branch as PR target unless later overridden. config.defaultBranch = repo.defaultBranchRef.name; // Base branch may be configured but defaultBranch is always fixed - config.baseBranch = config.defaultBranch; - logger.debug(`${repository} default branch = ${config.baseBranch}`); + logger.debug(`${repository} default branch = ${config.defaultBranch}`); // GitHub allows administrators to block certain types of merge, so we need to check it if (repo.rebaseMergeAllowed) { config.mergeMethod = 'rebase'; @@ -361,14 +360,14 @@ export async function initRepo({ ); // Need to update base branch logger.debug( - { baseBranch: config.baseBranch, parentSha }, - 'Setting baseBranch ref in fork' + { defaultBranch: config.defaultBranch, parentSha }, + 'Setting defaultBranch ref in fork' ); // This is a lovely "hack" by GitHub that lets us force update our fork's master // with the base commit from the parent repository try { await githubApi.patchJson( - `repos/${config.repository}/git/refs/heads/${config.baseBranch}`, + `repos/${config.repository}/git/refs/heads/${config.defaultBranch}`, { body: { sha: parentSha, @@ -434,7 +433,7 @@ export async function getRepoForceRebase(): Promise<boolean> { if (config.repoForceRebase === undefined) { try { config.repoForceRebase = false; - const branchProtection = await getBranchProtection(config.baseBranch); + const branchProtection = await getBranchProtection(config.defaultBranch); logger.debug('Found branch protection'); if (branchProtection.required_pull_request_reviews) { logger.debug( @@ -477,7 +476,6 @@ export async function getRepoForceRebase(): Promise<boolean> { // istanbul ignore next export async function setBaseBranch(branchName: string): Promise<string> { - config.baseBranch = branchName; const baseBranchSha = await git.setBranch(branchName); return baseBranchSha; } diff --git a/lib/platform/github/types.ts b/lib/platform/github/types.ts index 49eb596fc30610dd4a31d6186296ee8db098dd27..5c96728dcae15aba2ab128bb549a58c38673a9c7 100644 --- a/lib/platform/github/types.ts +++ b/lib/platform/github/types.ts @@ -37,7 +37,6 @@ export interface LocalRepoConfig { prList: GhPr[] | null; issueList: any[] | null; mergeMethod: string; - baseBranch: string; defaultBranch: string; repositoryOwner: string; repository: string | null; diff --git a/lib/platform/gitlab/index.ts b/lib/platform/gitlab/index.ts index 868db07ea5080b1d90b801db898a06ca0bdb4727..937b6e96b157897a2215afd2c7d341aa74ca405c 100644 --- a/lib/platform/gitlab/index.ts +++ b/lib/platform/gitlab/index.ts @@ -60,7 +60,6 @@ let config: { repository: string; localDir: string; defaultBranch: string; - baseBranch: string; email: string; prList: any[]; issueList: any[]; @@ -200,9 +199,8 @@ export async function initRepo({ } } config.defaultBranch = res.body.default_branch; - config.baseBranch = config.defaultBranch; config.mergeMethod = res.body.merge_method || 'merge'; - logger.debug(`${repository} default branch = ${config.baseBranch}`); + logger.debug(`${repository} default branch = ${config.defaultBranch}`); delete config.prList; logger.debug('Enabling Git FS'); const opts = hostRules.find({ @@ -266,8 +264,6 @@ export function getRepoForceRebase(): Promise<boolean> { } export async function setBaseBranch(branchName: string): Promise<string> { - logger.debug(`Setting baseBranch to ${branchName}`); - config.baseBranch = branchName; const baseBranchSha = await git.setBranch(branchName); return baseBranchSha; }