Merge branch 'main' into feat/debian-datasource

lib/config/presets/common.ts

@@ -42,6 +42,7 @@ export const removedPresets: Record<string, string | null> = {
     'customManagers:helmChartYamlAppVersions',
   'regexManagers:mavenPropertyVersions': 'customManagers:mavenPropertyVersions',
   'regexManagers:tfvarsVersions': 'customManagers:tfvarsVersions',
+  'workarounds:reduceRepologyServerLoad': null,
 };
 
 const renamedMonorepos: Record<string, string> = {

lib/config/presets/internal/workarounds.ts

@@ -14,7 +14,6 @@ export const presets: Record<string, Preset> = {
       'workarounds:ignoreHttp4sDigestMilestones',
       'workarounds:typesNodeVersioning',
       'workarounds:nodeDockerVersioning',
-      'workarounds:reduceRepologyServerLoad',
       'workarounds:doNotUpgradeFromAlpineStableToEdge',
       'workarounds:supportRedHatImageVersion',
       'workarounds:javaLTSVersions',
@@ -201,17 +200,6 @@ export const presets: Record<string, Preset> = {
       },
     ],
   },
-  reduceRepologyServerLoad: {
-    description:
-      'Limit requests to reduce load on Repology servers until we can fix this properly, see issue `#10133`.',
-    hostRules: [
-      {
-        concurrentRequestLimit: 1,
-        matchHost: 'repology.org',
-        maxRequestsPerSecond: 0.5,
-      },
-    ],
-  },
   supportRedHatImageVersion: {
     description:
       'Use specific versioning for Red Hat-maintained container images.',

lib/util/git/private-key.spec.ts

@@ -89,7 +89,8 @@ describe('util/git/private-key', () => {
 -----BEGIN OPENSSH PRIVATE KEY-----
 some-private-key with-passphrase
 some-private-key with-passphrase
------END OPENSSH PRIVATE KEY-----`);
+-----END OPENSSH PRIVATE KEY-----
+`);
       await expect(writePrivateKey()).rejects.toThrow();
     });
 
@@ -98,7 +99,8 @@ some-private-key with-passphrase
 -----BEGIN OPENSSH PRIVATE KEY-----
 some-private-key
 some-private-key
------END OPENSSH PRIVATE KEY-----`;
+-----END OPENSSH PRIVATE KEY-----
+`;
       const privateKeyFile = upath.join(os.tmpdir() + '/git-private-ssh.key');
       const publicKeyFile = `${privateKeyFile}.pub`;
       const publicKey = 'some-public-key';

lib/util/git/private-key.ts

@@ -24,7 +24,7 @@ abstract class PrivateKey {
   protected abstract readonly gpgFormat: string;
 
   constructor(key: string) {
-    this.key = key.trim();
+    this.key = key;
     addSecretForSanitizing(this.key, 'global');
     logger.debug(
       'gitPrivateKey: successfully set (but not yet written/configured)',
@@ -57,6 +57,10 @@ abstract class PrivateKey {
 class GPGKey extends PrivateKey {
   protected readonly gpgFormat = 'openpgp';
 
+  constructor(key: string) {
+    super(key.trim());
+  }
+
   protected async importKey(): Promise<string | undefined> {
     const keyFileName = upath.join(os.tmpdir() + '/git-private-gpg.key');
     await fs.outputFile(keyFileName, this.key);

lib/util/http/rate-limits.ts

@@ -9,6 +9,10 @@ const concurrencyDefaults: ConcurrencyLimitRule[] = [
     matchHost: 'registry.npmjs.org',
     concurrency: 999,
   },
+  {
+    matchHost: 'repology.org',
+    concurrency: 1,
+  },
   {
     matchHost: '*',
     concurrency: 16,
@@ -35,6 +39,10 @@ const throttleDefaults: ThrottleLimitRule[] = [
     matchHost: 'https://plugins.gradle.org',
     throttleMs: 50,
   },
+  {
+    matchHost: 'repology.org',
+    throttleMs: 2000,
+  },
 ];
 
 let throttleLimits: ThrottleLimitRule[] = [];

lib/workers/repository/reconfigure/index.spec.ts

@@ -37,6 +37,14 @@ describe('workers/repository/reconfigure/index', () => {
     GlobalConfig.reset();
   });
 
+  it('no effect when running with platform=local', async () => {
+    GlobalConfig.set({ platform: 'local' });
+    await validateReconfigureBranch(config);
+    expect(logger.debug).toHaveBeenCalledWith(
+      'Not attempting to reconfigure when running with local platform',
+    );
+  });
+
   it('no effect on repo with no reconfigure branch', async () => {
     scm.branchExists.mockResolvedValueOnce(false);
     await validateReconfigureBranch(config);

lib/workers/repository/reconfigure/index.ts

@@ -1,5 +1,6 @@
 import is from '@sindresorhus/is';
 import JSON5 from 'json5';
+import { GlobalConfig } from '../../../config/global';
 import type { RenovateConfig } from '../../../config/types';
 import { validateConfig } from '../../../config/validation';
 import { logger } from '../../../logger';
@@ -43,6 +44,13 @@ export async function validateReconfigureBranch(
   config: RenovateConfig,
 ): Promise<void> {
   logger.debug('validateReconfigureBranch()');
+  if (GlobalConfig.get('platform') === 'local') {
+    logger.debug(
+      'Not attempting to reconfigure when running with local platform',
+    );
+    return;
+  }
+
   const context = config.statusCheckNames?.configValidation;
 
   const branchName = getReconfigureBranchName(config.branchPrefix!);

package.json

@@ -335,7 +335,7 @@
     "nyc": "17.0.0",
     "pretty-format": "29.7.0",
     "rimraf": "6.0.1",
-    "semantic-release": "24.0.0",
+    "semantic-release": "24.1.0",
     "tar": "7.4.3",
     "tmp-promise": "3.0.3",
     "ts-jest": "29.2.4",