From 951f3d87b95ee90bfdf4e8fcc2ace2c4bb2bc5e1 Mon Sep 17 00:00:00 2001
From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com>
Date: Thu, 24 Aug 2023 15:07:30 +0200
Subject: [PATCH] refactor: replace verb renovating with plain English (#23408)
Co-authored-by: Rhys Arkins <rhys@arkins.net>
---
docs/usage/configuration-options.md | 3 ++-
.../repository/__snapshots__/dependency-dashboard.spec.ts.snap | 2 +-
lib/workers/repository/dependency-dashboard.ts | 2 +-
lib/workers/repository/index.ts | 2 +-
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/docs/usage/configuration-options.md b/docs/usage/configuration-options.md
index 29008604de..328c6be951 100644
--- a/docs/usage/configuration-options.md
+++ b/docs/usage/configuration-options.md
@@ -25,7 +25,8 @@ You can store your Renovate configuration file in one of these locations:
!!! warning
Storing the Renovate configuration in a `package.json` file is deprecated and support may be removed in the future.
-When renovating a repository, Renovate tries to detect the configuration files in the order listed above, and stops after the first one is found.
+When Renovate runs on a repository, it tries to find the configuration files in the order listed above.
+Renovate stops the search after it finds the first match.
Renovate always uses the config from the repository's default branch, even if that configuration specifies multiple `baseBranches`.
Renovate does not read/override the config from within each base branch if present.
diff --git a/lib/workers/repository/__snapshots__/dependency-dashboard.spec.ts.snap b/lib/workers/repository/__snapshots__/dependency-dashboard.spec.ts.snap
index ef4acccd71..6440ae199c 100644
--- a/lib/workers/repository/__snapshots__/dependency-dashboard.spec.ts.snap
+++ b/lib/workers/repository/__snapshots__/dependency-dashboard.spec.ts.snap
@@ -451,7 +451,7 @@ exports[`workers/repository/dependency-dashboard ensureDependencyDashboard() con
## Repository problems
-These problems occurred while renovating this repository.
+Renovate tried to run on this repository, but found these problems.
- ERROR: everything is broken
- WARN: just a bit
diff --git a/lib/workers/repository/dependency-dashboard.ts b/lib/workers/repository/dependency-dashboard.ts
index bf1b0542ec..04cab4eeab 100644
--- a/lib/workers/repository/dependency-dashboard.ts
+++ b/lib/workers/repository/dependency-dashboard.ts
@@ -176,7 +176,7 @@ function appendRepoProblems(config: RenovateConfig, issueBody: string): string {
newIssueBody += '## Repository problems\n\n';
const repoProblemsHeader =
config.customizeDashboard?.['repoProblemsHeader'] ??
- 'These problems occurred while renovating this repository.';
+ 'Renovate tried to run on this repository, but found these problems.';
newIssueBody += template.compile(repoProblemsHeader, config) + '\n\n';
for (const repoProblem of repoProblems) {
diff --git a/lib/workers/repository/index.ts b/lib/workers/repository/index.ts
index 2a9621a367..43dacba198 100644
--- a/lib/workers/repository/index.ts
+++ b/lib/workers/repository/index.ts
@@ -82,7 +82,7 @@ export async function renovateRepository(
}
if (res === 'automerged') {
if (canRetry) {
- logger.info('Renovating repository again after automerge result');
+ logger.info('Restarting repository job after automerge result');
const recursiveRes = await renovateRepository(repoConfig, false);
return recursiveRes;
}
--
GitLab