Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(onboarding): create OnboardingCache object #20886

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions lib/workers/repository/finalise/repository-statistics.ts
Expand Up @@ -46,6 +46,8 @@ function branchCacheToMetadata({
baseBranchSha,
branchName,
isModified,
isConflicted,
isBehindBase,
pristine: isPristine,
sha: branchSha,
}: BranchCache): BranchMetadata {
Expand All @@ -57,6 +59,8 @@ function branchCacheToMetadata({
branchSha,
isModified,
isPristine,
isConflicted,
isBehindBase,
RahulGautamSingh marked this conversation as resolved.
Show resolved Hide resolved
};
}

Expand Down
10 changes: 10 additions & 0 deletions lib/workers/repository/index.ts
Expand Up @@ -14,6 +14,7 @@ import * as queue from '../../util/http/queue';
import * as throttle from '../../util/http/throttle';
import * as schemaUtil from '../../util/schema';
import { addSplit, getSplits, splitInit } from '../../util/split';
import type { BranchConfig } from '../types';
import { setBranchCache } from './cache';
import { ensureDependencyDashboard } from './dependency-dashboard';
import handleError from './error';
Expand Down Expand Up @@ -73,6 +74,15 @@ export async function renovateRepository(
setMeta({ repository: config.repository });
addSplit('update');
if (performExtract) {
if (!config.repoIsOnboarded) {
branches.push({
branchName: config.onboardingBranch!,
baseBranch: config.defaultBranch!,
automerge: false,
upgrades: [],
manager: '' as never, // onboarding branch won't have this field
} satisfies BranchConfig);
RahulGautamSingh marked this conversation as resolved.
Show resolved Hide resolved
}
await setBranchCache(branches); // update branch cache if performed extraction
}
if (res === 'automerged') {
Expand Down
5 changes: 5 additions & 0 deletions lib/workers/repository/onboarding/branch/index.ts
Expand Up @@ -9,8 +9,10 @@ import {
import { logger } from '../../../../logger';
import { Pr, platform } from '../../../../modules/platform';
import { checkoutBranch, setGitAuthor } from '../../../../util/git';
import { setBranchNewCommit } from '../../../../util/git/set-branch-commit';
import { extractAllDependencies } from '../../extract';
import { mergeRenovateConfig } from '../../init/merge';
import { syncBranchState } from '../../process/write';
import { OnboardingState } from '../common';
import { getOnboardingPr, isOnboarded } from './check';
import { getOnboardingConfig } from './config';
Expand All @@ -28,6 +30,7 @@ export async function checkOnboardingBranch(
logger.debug('Repo is onboarded');
return { ...config, repoIsOnboarded };
}
await syncBranchState(config.onboardingBranch!, config.baseBranch!);
if (config.isFork && config.forkProcessing !== 'enabled') {
throw new Error(REPOSITORY_FORKED);
}
Expand All @@ -47,6 +50,7 @@ export async function checkOnboardingBranch(
{ branch: config.onboardingBranch, commit, onboarding: true },
'Branch updated'
);
setBranchNewCommit(config.onboardingBranch!, config.baseBranch!, commit);
}
// istanbul ignore if
if (platform.refreshPr) {
Expand Down Expand Up @@ -78,6 +82,7 @@ export async function checkOnboardingBranch(
{ branch: onboardingBranch, commit, onboarding: true },
'Branch created'
);
setBranchNewCommit(config.onboardingBranch!, config.baseBranch!, commit);
}
}
if (!GlobalConfig.get('dryRun')) {
Expand Down
2 changes: 2 additions & 0 deletions lib/workers/types.ts
Expand Up @@ -136,6 +136,8 @@ export interface BranchMetadata {
automerge: boolean;
isModified?: boolean;
isPristine?: boolean;
isConflicted?: boolean;
isBehindBase?: boolean;
}

export interface BaseBranchMetadata {
Expand Down