diff --git a/lib/config/types.ts b/lib/config/types.ts index e0cfa91a98543b17c37a39b734305ec2a99c2dbf..3c4dc8e078ece4e8122ccc3ad379d122907cd1aa 100644 --- a/lib/config/types.ts +++ b/lib/config/types.ts @@ -70,6 +70,7 @@ export interface GlobalOnlyConfig { autodiscover?: boolean; autodiscoverFilter?: string; baseDir?: string; + cacheDir?: string; forceCli?: boolean; gitPrivateKey?: string; logFile?: string; @@ -99,8 +100,6 @@ export interface RepoAdminConfig { } export interface LegacyAdminConfig { - cacheDir?: string; - endpoint?: string; localDir?: string; diff --git a/lib/util/cache/repository/index.spec.ts b/lib/util/cache/repository/index.spec.ts index 1095e227df97a615ae0e5a75c9d99acd4b0ee352..1e7f0e8250457d6ade1152082fea0446f7d6fc2e 100644 --- a/lib/util/cache/repository/index.spec.ts +++ b/lib/util/cache/repository/index.spec.ts @@ -1,5 +1,6 @@ import * as _fs from 'fs-extra'; import { getName, mocked } from '../../../../test/util'; +import { setAdminConfig } from '../../../config/admin'; import * as repositoryCache from '.'; jest.mock('fs-extra'); @@ -9,9 +10,9 @@ const fs = mocked(_fs); describe(getName(), () => { beforeEach(() => { jest.resetAllMocks(); + setAdminConfig({ cacheDir: '/tmp/renovate/cache/' }); }); const config = { - cacheDir: '/tmp/renovate/cache/', platform: 'github', repository: 'abc/def', }; diff --git a/lib/util/cache/repository/index.ts b/lib/util/cache/repository/index.ts index c8949ac215cfa78a3a485d042560bc64caa695ee..27779993b721661d8cff62dadb70fe9ed214af5f 100644 --- a/lib/util/cache/repository/index.ts +++ b/lib/util/cache/repository/index.ts @@ -1,5 +1,6 @@ import * as fs from 'fs-extra'; import { join } from 'upath'; +import { getAdminConfig } from '../../../config/admin'; import type { RenovateConfig, RepositoryCacheConfig, @@ -16,7 +17,7 @@ let cache: Cache = Object.create({}); export function getCacheFileName(config: RenovateConfig): string { return join( - config.cacheDir, + getAdminConfig().cacheDir, '/renovate/repository/', config.platform, config.repository + '.json'