From 7080a32e8da75fb54d7217d10bf31f652aa4f026 Mon Sep 17 00:00:00 2001
From: Sergei Zharinov <zharinov@users.noreply.github.com>
Date: Thu, 24 Jun 2021 13:35:13 +0400
Subject: [PATCH] refactor(cocoapods): Use util function for cache dir creation
(#10587)
---
lib/manager/cocoapods/artifacts.ts | 7 +++++--
lib/manager/cocoapods/utils.ts | 16 ----------------
2 files changed, 5 insertions(+), 18 deletions(-)
delete mode 100644 lib/manager/cocoapods/utils.ts
diff --git a/lib/manager/cocoapods/artifacts.ts b/lib/manager/cocoapods/artifacts.ts
index 50592398ae..fd63339dcf 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 e3a9af3b59..0000000000
--- 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;
-}
--
GitLab