From f5dc5ebcb430172d8ba664058fe41225a4ddcf31 Mon Sep 17 00:00:00 2001
From: Sergei Zharinov <zharinov@users.noreply.github.com>
Date: Wed, 24 May 2023 22:48:01 +0300
Subject: [PATCH] fix: Match both `yaml` and `yml` in all managers (#22416)
---
lib/modules/manager/batect/index.ts | 2 +-
lib/modules/manager/circleci/index.ts | 2 +-
lib/modules/manager/flux/common.ts | 2 +-
lib/modules/manager/gitlabci-include/index.ts | 2 +-
lib/modules/manager/gitlabci/index.ts | 2 +-
lib/modules/manager/helm-requirements/index.ts | 2 +-
lib/modules/manager/helm-values/index.ts | 2 +-
lib/modules/manager/helmfile/index.ts | 2 +-
lib/modules/manager/helmv3/index.ts | 2 +-
lib/modules/manager/pre-commit/index.ts | 2 +-
lib/modules/manager/travis/index.ts | 2 +-
11 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/lib/modules/manager/batect/index.ts b/lib/modules/manager/batect/index.ts
index b8fd77a5e8..466b348d0c 100644
--- a/lib/modules/manager/batect/index.ts
+++ b/lib/modules/manager/batect/index.ts
@@ -4,7 +4,7 @@ import { extractAllPackageFiles, extractPackageFile } from './extract';
export { extractAllPackageFiles, extractPackageFile };
export const defaultConfig = {
- fileMatch: ['(^|/)batect(-bundle)?\\.yml$'],
+ fileMatch: ['(^|/)batect(-bundle)?\\.ya?ml$'],
};
export const supportedDatasources = [GitTagsDatasource.id];
diff --git a/lib/modules/manager/circleci/index.ts b/lib/modules/manager/circleci/index.ts
index 183098e281..02ef7c70ae 100644
--- a/lib/modules/manager/circleci/index.ts
+++ b/lib/modules/manager/circleci/index.ts
@@ -9,7 +9,7 @@ export const displayName = 'CircleCI';
export const url = 'https://circleci.com/docs/configuration-reference';
export const defaultConfig = {
- fileMatch: ['(^|/)\\.circleci/config\\.yml$'],
+ fileMatch: ['(^|/)\\.circleci/config\\.ya?ml$'],
};
export const supportedDatasources = [DockerDatasource.id, OrbDatasource.id];
diff --git a/lib/modules/manager/flux/common.ts b/lib/modules/manager/flux/common.ts
index 3d9b97896f..b8f4b542cb 100644
--- a/lib/modules/manager/flux/common.ts
+++ b/lib/modules/manager/flux/common.ts
@@ -1,7 +1,7 @@
import { regEx } from '../../../util/regex';
export const systemManifestRegex =
- '(^|/)flux-system/(?:.+/)?gotk-components\\.yaml$';
+ '(^|/)flux-system/(?:.+/)?gotk-components\\.ya?ml$';
export function isSystemManifest(file: string): boolean {
return regEx(systemManifestRegex).test(file);
diff --git a/lib/modules/manager/gitlabci-include/index.ts b/lib/modules/manager/gitlabci-include/index.ts
index e769b42694..f7ecdd5110 100644
--- a/lib/modules/manager/gitlabci-include/index.ts
+++ b/lib/modules/manager/gitlabci-include/index.ts
@@ -4,7 +4,7 @@ import { extractPackageFile } from './extract';
export { extractPackageFile };
export const defaultConfig = {
- fileMatch: ['\\.gitlab-ci\\.yml$'],
+ fileMatch: ['\\.gitlab-ci\\.ya?ml$'],
};
export const supportedDatasources = [GitlabTagsDatasource.id];
diff --git a/lib/modules/manager/gitlabci/index.ts b/lib/modules/manager/gitlabci/index.ts
index 0bfa5b4943..3e74df89d6 100644
--- a/lib/modules/manager/gitlabci/index.ts
+++ b/lib/modules/manager/gitlabci/index.ts
@@ -7,7 +7,7 @@ export const language: ProgrammingLanguage = 'docker';
export { extractAllPackageFiles, extractPackageFile };
export const defaultConfig = {
- fileMatch: ['\\.gitlab-ci\\.yml$'],
+ fileMatch: ['\\.gitlab-ci\\.ya?ml$'],
};
export const supportedDatasources = [DockerDatasource.id];
diff --git a/lib/modules/manager/helm-requirements/index.ts b/lib/modules/manager/helm-requirements/index.ts
index e9df003fad..7c4a02772d 100644
--- a/lib/modules/manager/helm-requirements/index.ts
+++ b/lib/modules/manager/helm-requirements/index.ts
@@ -6,7 +6,7 @@ export const defaultConfig = {
stable: 'https://charts.helm.sh/stable',
},
commitMessageTopic: 'helm chart {{depName}}',
- fileMatch: ['(^|/)requirements\\.yaml$'],
+ fileMatch: ['(^|/)requirements\\.ya?ml$'],
};
export const supportedDatasources = [HelmDatasource.id];
diff --git a/lib/modules/manager/helm-values/index.ts b/lib/modules/manager/helm-values/index.ts
index 10f681049c..a9ef8d5353 100644
--- a/lib/modules/manager/helm-values/index.ts
+++ b/lib/modules/manager/helm-values/index.ts
@@ -3,7 +3,7 @@ export { extractPackageFile } from './extract';
export const defaultConfig = {
commitMessageTopic: 'helm values {{depName}}',
- fileMatch: ['(^|/)values\\.yaml$'],
+ fileMatch: ['(^|/)values\\.ya?ml$'],
pinDigests: false,
};
diff --git a/lib/modules/manager/helmfile/index.ts b/lib/modules/manager/helmfile/index.ts
index fbd8db27c4..0c17191ac5 100644
--- a/lib/modules/manager/helmfile/index.ts
+++ b/lib/modules/manager/helmfile/index.ts
@@ -10,7 +10,7 @@ export const defaultConfig = {
stable: 'https://charts.helm.sh/stable',
},
commitMessageTopic: 'helm chart {{depName}}',
- fileMatch: ['(^|/)helmfile\\.yaml$'],
+ fileMatch: ['(^|/)helmfile\\.ya?ml$'],
};
export const supportedDatasources = [HelmDatasource.id, DockerDatasource.id];
diff --git a/lib/modules/manager/helmv3/index.ts b/lib/modules/manager/helmv3/index.ts
index 006145b5c8..a84cbb47b4 100644
--- a/lib/modules/manager/helmv3/index.ts
+++ b/lib/modules/manager/helmv3/index.ts
@@ -11,7 +11,7 @@ export const defaultConfig = {
stable: 'https://charts.helm.sh/stable',
},
commitMessageTopic: 'helm chart {{depName}}',
- fileMatch: ['(^|/)Chart\\.yaml$'],
+ fileMatch: ['(^|/)Chart\\.ya?ml$'],
};
export const supportedDatasources = [DockerDatasource.id, HelmDatasource.id];
diff --git a/lib/modules/manager/pre-commit/index.ts b/lib/modules/manager/pre-commit/index.ts
index f52495f8a1..914529ed56 100644
--- a/lib/modules/manager/pre-commit/index.ts
+++ b/lib/modules/manager/pre-commit/index.ts
@@ -10,7 +10,7 @@ export const supportedDatasources = [
export const defaultConfig = {
commitMessageTopic: 'pre-commit hook {{depName}}',
enabled: false,
- fileMatch: ['(^|/)\\.pre-commit-config\\.yaml$'],
+ fileMatch: ['(^|/)\\.pre-commit-config\\.ya?ml$'],
prBodyNotes: [
'Note: The `pre-commit` manager in Renovate is not supported by the `pre-commit` maintainers or community. Please do not report any problems there, instead [create a Discussion in the Renovate repository](https://github.com/renovatebot/renovate/discussions/new) if you have any questions.',
],
diff --git a/lib/modules/manager/travis/index.ts b/lib/modules/manager/travis/index.ts
index baa3937b54..4bf39140df 100644
--- a/lib/modules/manager/travis/index.ts
+++ b/lib/modules/manager/travis/index.ts
@@ -9,7 +9,7 @@ export const language: ProgrammingLanguage = 'node';
export const supportedDatasources = [GithubTagsDatasource.id];
export const defaultConfig = {
- fileMatch: ['^\\.travis\\.yml$'],
+ fileMatch: ['^\\.travis\\.ya?ml$'],
major: {
enabled: false,
},
--
GitLab