From 8c79536101ca25e8194b512ac8252a3553ff8d99 Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Thu, 22 Nov 2018 16:06:02 +0100
Subject: [PATCH] feat(config): allow .github/renovate.json
---
lib/workers/repository/init/config.js | 2 ++
lib/workers/repository/onboarding/branch/check.js | 1 +
test/workers/repository/init/config.spec.js | 8 ++++++++
3 files changed, 11 insertions(+)
diff --git a/lib/workers/repository/init/config.js b/lib/workers/repository/init/config.js
index 8bc2b5d238..f9628deae9 100644
--- a/lib/workers/repository/init/config.js
+++ b/lib/workers/repository/init/config.js
@@ -31,6 +31,8 @@ async function mergeRenovateConfig(config) {
let configFile;
if (fileList.includes('renovate.json')) {
configFile = 'renovate.json';
+ } else if (fileList.includes('.github/renovate.json')) {
+ configFile = '.github/renovate.json';
} else if (fileList.includes('.renovaterc')) {
configFile = '.renovaterc';
} else if (fileList.includes('.renovaterc.json')) {
diff --git a/lib/workers/repository/onboarding/branch/check.js b/lib/workers/repository/onboarding/branch/check.js
index d373acb96a..19f9271fd6 100644
--- a/lib/workers/repository/onboarding/branch/check.js
+++ b/lib/workers/repository/onboarding/branch/check.js
@@ -6,6 +6,7 @@ const findFile = async fileName => {
const renovateJsonExists = async () =>
(await findFile('renovate.json')) ||
+ (await findFile('.github/renovate.json')) ||
(await findFile('.renovaterc')) ||
findFile('.renovaterc.json');
diff --git a/test/workers/repository/init/config.spec.js b/test/workers/repository/init/config.spec.js
index 1897a0c7ee..d2e8677a47 100644
--- a/test/workers/repository/init/config.spec.js
+++ b/test/workers/repository/init/config.spec.js
@@ -66,6 +66,14 @@ describe('workers/repository/init/config', () => {
expect(e.validationError).toMatchSnapshot();
expect(e.validationMessage).toMatchSnapshot();
});
+ it('finds .github/renovate.json', async () => {
+ platform.getFileList.mockReturnValue([
+ 'package.json',
+ '.github/renovate.json',
+ ]);
+ platform.getFile.mockReturnValue('{}');
+ await mergeRenovateConfig(config);
+ });
it('finds .renovaterc.json', async () => {
platform.getFileList.mockReturnValue([
'package.json',
--
GitLab