diff --git a/lib/manager/cocoapods/artifacts.ts b/lib/manager/cocoapods/artifacts.ts index 50592398ae27d926c773a935cfb8b5d9fb2afbe7..fd63339dcff1106862e4fac62a3c1fcd62cd8ecc 100644 --- a/lib/manager/cocoapods/artifacts.ts +++ b/lib/manager/cocoapods/artifacts.ts @@ -4,13 +4,13 @@ import { TEMPORARY_ERROR } from '../../constants/error-messages'; import { logger } from '../../logger'; import { ExecOptions, exec } from '../../util/exec'; import { + ensureCacheDir, getSiblingFileName, readLocalFile, writeLocalFile, } from '../../util/fs'; import { getRepoStatus } from '../../util/git'; import type { UpdateArtifact, UpdateArtifactsResult } from '../types'; -import { getCocoaPodsHome } from './utils'; const pluginRegex = /^\s*plugin\s*(['"])(?<plugin>[^'"]+)\1/; @@ -67,11 +67,14 @@ export async function updateArtifacts({ ); const tagConstraint = match?.groups?.cocoapodsVersion ?? null; + const cacheDir = await ensureCacheDir('./others/cocoapods', 'CP_HOME_DIR'); + logger.debug(`Using cocoapods home ${cacheDir}`); + const cmd = [...getPluginCommands(newPackageFileContent), 'pod install']; const execOptions: ExecOptions = { cwdFile: packageFileName, extraEnv: { - CP_HOME_DIR: await getCocoaPodsHome(config), + CP_HOME_DIR: cacheDir, }, docker: { image: 'cocoapods', diff --git a/lib/manager/cocoapods/utils.ts b/lib/manager/cocoapods/utils.ts deleted file mode 100644 index e3a9af3b599faf09a7b46a3d86ff5fdd6207ba6d..0000000000000000000000000000000000000000 --- a/lib/manager/cocoapods/utils.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { join } from 'upath'; -import { getAdminConfig } from '../../config/admin'; -import { logger } from '../../logger'; -import { ensureDir } from '../../util/fs'; -import type { UpdateArtifactsConfig } from '../types'; - -export async function getCocoaPodsHome( - config: UpdateArtifactsConfig -): Promise<string> { - const adminCacheDir = getAdminConfig().cacheDir; - const cacheDir = - process.env.CP_HOME_DIR || join(adminCacheDir, './others/cocoapods'); - await ensureDir(cacheDir); - logger.debug(`Using cocoapods home ${cacheDir}`); - return cacheDir; -}