From 51ca6957e2b3f5d1027173826125c197f51de97c Mon Sep 17 00:00:00 2001 From: Sergei Zharinov <zharinov@users.noreply.github.com> Date: Tue, 27 Aug 2024 00:31:46 -0300 Subject: [PATCH] refactor(conan): Use single cache namespace (#31033) --- lib/modules/datasource/conan/index.ts | 6 +++--- lib/util/cache/package/types.ts | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/modules/datasource/conan/index.ts b/lib/modules/datasource/conan/index.ts index 2a82502dc0..a25d36280c 100644 --- a/lib/modules/datasource/conan/index.ts +++ b/lib/modules/datasource/conan/index.ts @@ -74,10 +74,10 @@ export class ConanDatasource extends Datasource { } @cache({ - namespace: `datasource-${datasource}-revisions`, + namespace: `datasource-${datasource}`, key: ({ registryUrl, packageName }: DigestConfig, newValue?: string) => // TODO: types (#22198) - `${registryUrl!}:${packageName}:${newValue!}`, + `getDigest:${registryUrl!}:${packageName}:${newValue!}`, }) override async getDigest( { registryUrl, packageName }: DigestConfig, @@ -106,7 +106,7 @@ export class ConanDatasource extends Datasource { namespace: `datasource-${datasource}`, key: ({ registryUrl, packageName }: GetReleasesConfig) => // TODO: types (#22198) - `${registryUrl}:${packageName}`, + `getReleases:${registryUrl}:${packageName}`, }) async getReleases({ registryUrl, diff --git a/lib/util/cache/package/types.ts b/lib/util/cache/package/types.ts index ae3e9ddc24..faff79c6e6 100644 --- a/lib/util/cache/package/types.ts +++ b/lib/util/cache/package/types.ts @@ -36,7 +36,6 @@ export type PackageCacheNamespace = | 'datasource-bitrise' | 'datasource-cdnjs-digest' | 'datasource-cdnjs' - | 'datasource-conan-revisions' | 'datasource-conan' | 'datasource-conda' | 'datasource-cpan' -- GitLab