Skip to content
Snippets Groups Projects
Unverified Commit cf4fcce8 authored by Rhys Arkins's avatar Rhys Arkins Committed by GitHub
Browse files

fix(onboarding): use default preset only if truthy (#16596)

Closes #16526
parent badccaff
No related branches found
No related tags found
No related merge requests found
...@@ -26,8 +26,9 @@ async function getOnboardingConfig( ...@@ -26,8 +26,9 @@ async function getOnboardingConfig(
// Check for org/renovate-config // Check for org/renovate-config
try { try {
const repo = `${orgName}/renovate-config`; const repo = `${orgName}/renovate-config`;
await getPreset({ repo }); if (await getPreset({ repo })) {
orgPreset = `local>${repo}`; orgPreset = `local>${repo}`;
}
} catch (err) { } catch (err) {
if ( if (
err.message !== PRESET_DEP_NOT_FOUND && err.message !== PRESET_DEP_NOT_FOUND &&
...@@ -43,11 +44,14 @@ async function getOnboardingConfig( ...@@ -43,11 +44,14 @@ async function getOnboardingConfig(
try { try {
const repo = `${orgName}/.${platform}`; const repo = `${orgName}/.${platform}`;
const presetName = 'renovate-config'; const presetName = 'renovate-config';
if (
await getPreset({ await getPreset({
repo, repo,
presetName, presetName,
}); })
) {
orgPreset = `local>${repo}:${presetName}`; orgPreset = `local>${repo}:${presetName}`;
}
} catch (err) { } catch (err) {
if ( if (
err.message !== PRESET_DEP_NOT_FOUND && err.message !== PRESET_DEP_NOT_FOUND &&
...@@ -59,6 +63,9 @@ async function getOnboardingConfig( ...@@ -59,6 +63,9 @@ async function getOnboardingConfig(
} }
if (orgPreset) { if (orgPreset) {
logger.debug(
`Found org preset ${orgPreset} - using it in onboarding config`
);
onboardingConfig = { onboardingConfig = {
$schema: 'https://docs.renovatebot.com/renovate-schema.json', $schema: 'https://docs.renovatebot.com/renovate-schema.json',
extends: [orgPreset], extends: [orgPreset],
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment