renovate 44.112.2 → 44.112.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/util/cache/repository/types.d.ts +3 -2
- package/dist/workers/repository/reconfigure/index.js +7 -4
- package/dist/workers/repository/reconfigure/index.js.map +1 -1
- package/dist/workers/repository/reconfigure/reconfigure-cache.js +2 -2
- package/dist/workers/repository/reconfigure/reconfigure-cache.js.map +1 -1
- package/package.json +2 -2
- package/renovate-schema.json +2 -2
- package/dist/workers/repository/process/extract-update.d.ts +0 -14
- package/dist/workers/repository/process/write.d.ts +0 -3
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { RepoInitConfig } from "../../../workers/repository/init/types.js";
|
|
2
2
|
import { PrBlockedBy } from "../../../workers/types.js";
|
|
3
|
-
import { ExtractResult } from "../../../workers/repository/process/extract-update.js";
|
|
4
3
|
import { PackageFile } from "../../../modules/manager/types.js";
|
|
5
4
|
import { RepositoryCacheConfig, RepositoryCacheType, UpdateType } from "../../../config/types.js";
|
|
6
5
|
//#region lib/util/cache/repository/types.d.ts
|
|
@@ -42,7 +41,9 @@ interface OnboardingBranchCache {
|
|
|
42
41
|
interface ReconfigureBranchCache {
|
|
43
42
|
reconfigureBranchSha: string;
|
|
44
43
|
isConfigValid: boolean;
|
|
45
|
-
|
|
44
|
+
extractionSucceeded?: boolean;
|
|
45
|
+
/** @deprecated Written by earlier versions, migrated to `extractionSucceeded` when the cache is read. */
|
|
46
|
+
extractResult?: unknown;
|
|
46
47
|
}
|
|
47
48
|
interface PrCache {
|
|
48
49
|
/**
|
|
@@ -34,7 +34,11 @@ async function checkReconfigureBranch(config, repoConfig) {
|
|
|
34
34
|
});
|
|
35
35
|
const branchSha = getBranchCommit(reconfigureBranch);
|
|
36
36
|
const reconfigureCache = getCache().reconfigureBranchCache;
|
|
37
|
-
if (reconfigureCache?.
|
|
37
|
+
if (reconfigureCache?.extractResult) {
|
|
38
|
+
reconfigureCache.extractionSucceeded = true;
|
|
39
|
+
delete reconfigureCache.extractResult;
|
|
40
|
+
}
|
|
41
|
+
if (reconfigureCache?.reconfigureBranchSha === branchSha && (!existingPr || reconfigureCache.extractionSucceeded)) {
|
|
38
42
|
logger.debug("Skipping validation check as branch sha is unchanged");
|
|
39
43
|
return;
|
|
40
44
|
}
|
|
@@ -72,10 +76,9 @@ async function checkReconfigureBranch(config, repoConfig) {
|
|
|
72
76
|
await scm.checkoutBranch(config.defaultBranch);
|
|
73
77
|
return;
|
|
74
78
|
}
|
|
75
|
-
|
|
76
|
-
if (!await ensureReconfigurePrComment(newConfig, extractResult.packageFiles, extractResult.branches, reconfigureBranch, existingPr)) extractResult = void 0;
|
|
79
|
+
const commentEnsured = await ensureReconfigurePrComment(newConfig, extractResult.packageFiles, extractResult.branches, reconfigureBranch, existingPr);
|
|
77
80
|
await setBranchStatus(reconfigureBranch, "Validation Successful", "green", context);
|
|
78
|
-
setReconfigureBranchCache(branchSha, true,
|
|
81
|
+
setReconfigureBranchCache(branchSha, true, commentEnsured);
|
|
79
82
|
await scm.checkoutBranch(config.defaultBranch);
|
|
80
83
|
}
|
|
81
84
|
//#endregion
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","names":[],"sources":["../../../../lib/workers/repository/reconfigure/index.ts"],"sourcesContent":["import { GlobalConfig } from '../../../config/global.ts';\nimport { applySecretsAndVariablesToConfig } from '../../../config/secrets.ts';\nimport type { AllConfig, RenovateConfig } from '../../../config/types.ts';\nimport { logger } from '../../../logger/index.ts';\nimport { platform } from '../../../modules/platform/index.ts';\nimport { scm } from '../../../modules/platform/scm.ts';\nimport { getCache } from '../../../util/cache/repository/index.ts';\nimport { getBranchCommit } from '../../../util/git/index.ts';\nimport { mergeInheritedConfig } from '../init/inherited.ts';\nimport { mergeRenovateConfig } from '../init/merge.ts';\nimport type { ExtractResult } from '../process/extract-update.ts';\nimport { extractDependencies } from '../process/index.ts';\nimport { ensureReconfigurePrComment } from './comment.ts';\nimport {\n deleteReconfigureBranchCache,\n setReconfigureBranchCache,\n} from './reconfigure-cache.ts';\nimport {\n getReconfigureBranchName,\n getReconfigureConfig,\n setBranchStatus,\n} from './utils.ts';\nimport { validateReconfigureBranch } from './validate.ts';\n\nexport async function checkReconfigureBranch(\n config: RenovateConfig,\n repoConfig: AllConfig,\n): Promise<void> {\n logger.debug('checkReconfigureBranch()');\n if (GlobalConfig.get('platform') === 'local') {\n logger.debug(\n 'Not attempting to reconfigure when running with local platform',\n );\n return;\n }\n\n const context = config.statusCheckNames?.configValidation;\n const reconfigureBranch = getReconfigureBranchName(config.branchPrefix!);\n const branchExists = await scm.branchExists(reconfigureBranch);\n\n // this is something the user initiates, skip if no branch exists\n if (!branchExists) {\n logger.debug({ reconfigureBranch }, 'No reconfigure branch found');\n deleteReconfigureBranchCache(); // in order to remove cache when the branch has been deleted\n return;\n }\n\n const existingPr = await platform.findPr({\n branchName: reconfigureBranch,\n state: 'open',\n includeOtherAuthors: true,\n targetBranch: config.defaultBranch,\n });\n const branchSha = getBranchCommit(reconfigureBranch)!;\n const cache = getCache();\n const reconfigureCache = cache.reconfigureBranchCache;\n\n // only use valid cached information\n if (\n reconfigureCache?.reconfigureBranchSha === branchSha &&\n (!existingPr || reconfigureCache.
|
|
1
|
+
{"version":3,"file":"index.js","names":[],"sources":["../../../../lib/workers/repository/reconfigure/index.ts"],"sourcesContent":["import { GlobalConfig } from '../../../config/global.ts';\nimport { applySecretsAndVariablesToConfig } from '../../../config/secrets.ts';\nimport type { AllConfig, RenovateConfig } from '../../../config/types.ts';\nimport { logger } from '../../../logger/index.ts';\nimport { platform } from '../../../modules/platform/index.ts';\nimport { scm } from '../../../modules/platform/scm.ts';\nimport { getCache } from '../../../util/cache/repository/index.ts';\nimport { getBranchCommit } from '../../../util/git/index.ts';\nimport { mergeInheritedConfig } from '../init/inherited.ts';\nimport { mergeRenovateConfig } from '../init/merge.ts';\nimport type { ExtractResult } from '../process/extract-update.ts';\nimport { extractDependencies } from '../process/index.ts';\nimport { ensureReconfigurePrComment } from './comment.ts';\nimport {\n deleteReconfigureBranchCache,\n setReconfigureBranchCache,\n} from './reconfigure-cache.ts';\nimport {\n getReconfigureBranchName,\n getReconfigureConfig,\n setBranchStatus,\n} from './utils.ts';\nimport { validateReconfigureBranch } from './validate.ts';\n\nexport async function checkReconfigureBranch(\n config: RenovateConfig,\n repoConfig: AllConfig,\n): Promise<void> {\n logger.debug('checkReconfigureBranch()');\n if (GlobalConfig.get('platform') === 'local') {\n logger.debug(\n 'Not attempting to reconfigure when running with local platform',\n );\n return;\n }\n\n const context = config.statusCheckNames?.configValidation;\n const reconfigureBranch = getReconfigureBranchName(config.branchPrefix!);\n const branchExists = await scm.branchExists(reconfigureBranch);\n\n // this is something the user initiates, skip if no branch exists\n if (!branchExists) {\n logger.debug({ reconfigureBranch }, 'No reconfigure branch found');\n deleteReconfigureBranchCache(); // in order to remove cache when the branch has been deleted\n return;\n }\n\n const existingPr = await platform.findPr({\n branchName: reconfigureBranch,\n state: 'open',\n includeOtherAuthors: true,\n targetBranch: config.defaultBranch,\n });\n const branchSha = getBranchCommit(reconfigureBranch)!;\n const cache = getCache();\n const reconfigureCache = cache.reconfigureBranchCache;\n // migrate the extract result persisted by earlier versions\n if (reconfigureCache?.extractResult) {\n reconfigureCache.extractionSucceeded = true;\n delete reconfigureCache.extractResult;\n }\n\n // only use valid cached information\n if (\n reconfigureCache?.reconfigureBranchSha === branchSha &&\n (!existingPr || reconfigureCache.extractionSucceeded)\n ) {\n logger.debug('Skipping validation check as branch sha is unchanged');\n return;\n }\n\n const result = await getReconfigureConfig(reconfigureBranch);\n\n if (!result.ok) {\n await setBranchStatus(reconfigureBranch, result.errMessage, 'red', context);\n setReconfigureBranchCache(branchSha, false);\n await scm.checkoutBranch(config.defaultBranch!);\n return;\n }\n\n const isValidConfig = await validateReconfigureBranch(\n config,\n result.config,\n result.configFileName,\n existingPr,\n );\n\n if (!isValidConfig) {\n logger.debug(\n 'Found errors in reconfigure config. Skipping dependencies extraction',\n );\n await scm.checkoutBranch(config.defaultBranch!);\n return;\n }\n\n if (!existingPr) {\n logger.debug('No reconfigure pr found. Skipping dependencies extraction');\n await scm.checkoutBranch(config.defaultBranch!);\n return;\n }\n\n let extractResult: ExtractResult;\n // Recompute config similar to repo config processing\n // Get non-global config from file config\n // Merge it with inherited and static repo config\n // Finally, merge the reconfigure config\n let newConfig = GlobalConfig.set(\n applySecretsAndVariablesToConfig({\n config: repoConfig,\n }),\n );\n newConfig.baseBranch = config.defaultBranch;\n newConfig.repoIsOnboarded = true;\n newConfig.errors = [];\n newConfig.warnings = [];\n\n try {\n newConfig = await mergeInheritedConfig(newConfig);\n newConfig = await mergeRenovateConfig(newConfig, reconfigureBranch);\n await scm.checkoutBranch(config.defaultBranch!);\n extractResult = await extractDependencies(newConfig, false);\n } catch (err) {\n logger.debug(\n { err },\n 'Error while extracting dependencies using the reconfigure config',\n );\n setReconfigureBranchCache(branchSha, true);\n await scm.checkoutBranch(config.defaultBranch!); // being cautious\n return;\n }\n\n const commentEnsured = await ensureReconfigurePrComment(\n newConfig,\n extractResult.packageFiles,\n extractResult.branches,\n reconfigureBranch,\n existingPr,\n );\n\n await setBranchStatus(\n reconfigureBranch,\n 'Validation Successful',\n 'green',\n context,\n );\n // if comment is not added or updated, re-process the reconfigure branch on next run and do not skip\n setReconfigureBranchCache(branchSha, true, commentEnsured);\n await scm.checkoutBranch(config.defaultBranch!); //being cautious\n}\n"],"mappings":";;;;;;;;;;;;;;;AAwBA,eAAsB,uBACpB,QACA,YACe;CACf,OAAO,MAAM,0BAA0B;CACvC,IAAI,aAAa,IAAI,UAAU,MAAM,SAAS;EAC5C,OAAO,MACL,gEACF;EACA;CACF;CAEA,MAAM,UAAU,OAAO,kBAAkB;CACzC,MAAM,oBAAoB,yBAAyB,OAAO,YAAa;CAIvE,IAAI,CAAC,MAHsB,IAAI,aAAa,iBAAiB,GAG1C;EACjB,OAAO,MAAM,EAAE,kBAAkB,GAAG,6BAA6B;EACjE,6BAA6B;EAC7B;CACF;CAEA,MAAM,aAAa,MAAM,SAAS,OAAO;EACvC,YAAY;EACZ,OAAO;EACP,qBAAqB;EACrB,cAAc,OAAO;CACvB,CAAC;CACD,MAAM,YAAY,gBAAgB,iBAAiB;CAEnD,MAAM,mBADQ,SACe,CAAC,CAAC;CAE/B,IAAI,kBAAkB,eAAe;EACnC,iBAAiB,sBAAsB;EACvC,OAAO,iBAAiB;CAC1B;CAGA,IACE,kBAAkB,yBAAyB,cAC1C,CAAC,cAAc,iBAAiB,sBACjC;EACA,OAAO,MAAM,sDAAsD;EACnE;CACF;CAEA,MAAM,SAAS,MAAM,qBAAqB,iBAAiB;CAE3D,IAAI,CAAC,OAAO,IAAI;EACd,MAAM,gBAAgB,mBAAmB,OAAO,YAAY,OAAO,OAAO;EAC1E,0BAA0B,WAAW,KAAK;EAC1C,MAAM,IAAI,eAAe,OAAO,aAAc;EAC9C;CACF;CASA,IAAI,CAAC,MAPuB,0BAC1B,QACA,OAAO,QACP,OAAO,gBACP,UACF,GAEoB;EAClB,OAAO,MACL,sEACF;EACA,MAAM,IAAI,eAAe,OAAO,aAAc;EAC9C;CACF;CAEA,IAAI,CAAC,YAAY;EACf,OAAO,MAAM,2DAA2D;EACxE,MAAM,IAAI,eAAe,OAAO,aAAc;EAC9C;CACF;CAEA,IAAI;CAKJ,IAAI,YAAY,aAAa,IAC3B,iCAAiC,EAC/B,QAAQ,WACV,CAAC,CACH;CACA,UAAU,aAAa,OAAO;CAC9B,UAAU,kBAAkB;CAC5B,UAAU,SAAS,CAAC;CACpB,UAAU,WAAW,CAAC;CAEtB,IAAI;EACF,YAAY,MAAM,qBAAqB,SAAS;EAChD,YAAY,MAAM,oBAAoB,WAAW,iBAAiB;EAClE,MAAM,IAAI,eAAe,OAAO,aAAc;EAC9C,gBAAgB,MAAM,oBAAoB,WAAW,KAAK;CAC5D,SAAS,KAAK;EACZ,OAAO,MACL,EAAE,IAAI,GACN,kEACF;EACA,0BAA0B,WAAW,IAAI;EACzC,MAAM,IAAI,eAAe,OAAO,aAAc;EAC9C;CACF;CAEA,MAAM,iBAAiB,MAAM,2BAC3B,WACA,cAAc,cACd,cAAc,UACd,mBACA,UACF;CAEA,MAAM,gBACJ,mBACA,yBACA,SACA,OACF;CAEA,0BAA0B,WAAW,MAAM,cAAc;CACzD,MAAM,IAAI,eAAe,OAAO,aAAc;AAChD"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { logger } from "../../../logger/index.js";
|
|
2
2
|
import { getCache } from "../../../util/cache/repository/index.js";
|
|
3
3
|
//#region lib/workers/repository/reconfigure/reconfigure-cache.ts
|
|
4
|
-
function setReconfigureBranchCache(reconfigureBranchSha, isConfigValid,
|
|
4
|
+
function setReconfigureBranchCache(reconfigureBranchSha, isConfigValid, extractionSucceeded) {
|
|
5
5
|
const cache = getCache();
|
|
6
6
|
const reconfigureBranchCache = {
|
|
7
7
|
reconfigureBranchSha,
|
|
8
8
|
isConfigValid,
|
|
9
|
-
...
|
|
9
|
+
...extractionSucceeded && { extractionSucceeded }
|
|
10
10
|
};
|
|
11
11
|
if (cache.reconfigureBranchCache) {
|
|
12
12
|
logger.debug({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reconfigure-cache.js","names":[],"sources":["../../../../lib/workers/repository/reconfigure/reconfigure-cache.ts"],"sourcesContent":["import { logger } from '../../../logger/index.ts';\nimport { getCache } from '../../../util/cache/repository/index.ts';\
|
|
1
|
+
{"version":3,"file":"reconfigure-cache.js","names":[],"sources":["../../../../lib/workers/repository/reconfigure/reconfigure-cache.ts"],"sourcesContent":["import { logger } from '../../../logger/index.ts';\nimport { getCache } from '../../../util/cache/repository/index.ts';\n\nexport function setReconfigureBranchCache(\n reconfigureBranchSha: string,\n isConfigValid: boolean,\n extractionSucceeded?: boolean,\n): void {\n const cache = getCache();\n const reconfigureBranchCache = {\n reconfigureBranchSha,\n isConfigValid,\n ...(extractionSucceeded && { extractionSucceeded }),\n };\n if (cache.reconfigureBranchCache) {\n logger.debug(\n {\n reconfigureBranchSha,\n isConfigValid,\n },\n 'Update reconfigure branch cache',\n );\n logger.trace({ reconfigureBranchCache }, 'Update reconfigure branch cache');\n } else {\n logger.debug(\n {\n reconfigureBranchSha,\n isConfigValid,\n },\n 'Create reconfigure branch cache',\n );\n logger.trace({ reconfigureBranchCache }, 'Create reconfigure branch cache');\n }\n cache.reconfigureBranchCache = reconfigureBranchCache;\n}\n\nexport function deleteReconfigureBranchCache(): void {\n const cache = getCache();\n\n if (cache?.reconfigureBranchCache) {\n logger.debug('Delete reconfigure branch cache');\n delete cache.reconfigureBranchCache;\n }\n}\n"],"mappings":";;;AAGA,SAAgB,0BACd,sBACA,eACA,qBACM;CACN,MAAM,QAAQ,SAAS;CACvB,MAAM,yBAAyB;EAC7B;EACA;EACA,GAAI,uBAAuB,EAAE,oBAAoB;CACnD;CACA,IAAI,MAAM,wBAAwB;EAChC,OAAO,MACL;GACE;GACA;EACF,GACA,iCACF;EACA,OAAO,MAAM,EAAE,uBAAuB,GAAG,iCAAiC;CAC5E,OAAO;EACL,OAAO,MACL;GACE;GACA;EACF,GACA,iCACF;EACA,OAAO,MAAM,EAAE,uBAAuB,GAAG,iCAAiC;CAC5E;CACA,MAAM,yBAAyB;AACjC;AAEA,SAAgB,+BAAqC;CACnD,MAAM,QAAQ,SAAS;CAEvB,IAAI,OAAO,wBAAwB;EACjC,OAAO,MAAM,iCAAiC;EAC9C,OAAO,MAAM;CACf;AACF"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "renovate",
|
|
3
3
|
"description": "Automated dependency updates. Flexible so you don't need to be.",
|
|
4
|
-
"version": "44.112.
|
|
4
|
+
"version": "44.112.3",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"bin": {
|
|
7
7
|
"renovate": "dist/renovate.js",
|
|
@@ -285,7 +285,7 @@
|
|
|
285
285
|
"semantic-release": "25.0.9",
|
|
286
286
|
"tmp-promise": "3.0.3",
|
|
287
287
|
"tsdown": "0.22.14",
|
|
288
|
-
"type-fest": "5.
|
|
288
|
+
"type-fest": "5.10.0",
|
|
289
289
|
"typescript": "7.0.2",
|
|
290
290
|
"unified": "11.0.5",
|
|
291
291
|
"vite": "8.3.0",
|
package/renovate-schema.json
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
{
|
|
2
2
|
"$id": "https://docs.renovatebot.com/renovate-schema.json",
|
|
3
|
-
"title": "JSON schema for Renovate 44.112.
|
|
3
|
+
"title": "JSON schema for Renovate 44.112.3 config files (https://renovatebot.com/)",
|
|
4
4
|
"$schema": "http://json-schema.org/draft-07/schema#",
|
|
5
|
-
"x-renovate-version": "44.112.
|
|
5
|
+
"x-renovate-version": "44.112.3",
|
|
6
6
|
"allowComments": true,
|
|
7
7
|
"type": "object",
|
|
8
8
|
"definitions": {
|
|
@@ -1,14 +0,0 @@
|
|
|
1
|
-
import { BranchConfig } from "../../types.js";
|
|
2
|
-
import "./write.js";
|
|
3
|
-
import "../../../util/cache/repository/types.js";
|
|
4
|
-
import { PackageFile } from "../../../modules/manager/types.js";
|
|
5
|
-
import "../../../config/types.js";
|
|
6
|
-
//#region lib/workers/repository/process/extract-update.d.ts
|
|
7
|
-
interface ExtractResult {
|
|
8
|
-
branches: BranchConfig[];
|
|
9
|
-
branchList: string[];
|
|
10
|
-
packageFiles: Record<string, PackageFile[]>;
|
|
11
|
-
}
|
|
12
|
-
//#endregion
|
|
13
|
-
export { ExtractResult };
|
|
14
|
-
//# sourceMappingURL=extract-update.d.ts.map
|