diff --git a/README.md b/README.md index 129b9cb..21f9d5c 100644 --- a/README.md +++ b/README.md @@ -54,6 +54,9 @@ lockComment: > # pulls: # daysUntilLock: 30 + +# Repository to extend settings from +# _extends: repo ``` ## How are issues and pull requests determined to be inactive? diff --git a/assets/app-description.md b/assets/app-description.md index 455db5d..b0bf0dc 100644 --- a/assets/app-description.md +++ b/assets/app-description.md @@ -41,6 +41,9 @@ lockComment: > # pulls: # daysUntilLock: 30 + +# Repository to extend settings from +# _extends: repo ``` ## Supporting the Project diff --git a/package.json b/package.json index e9ef9cc..3a15a6d 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,7 @@ "dependencies": { "joi": "^13.3.0", "probot": "^6.2.0", + "probot-config": "^0.1.0", "probot-scheduler": "^1.1.0", "uuid": "^3.2.1" }, diff --git a/src/index.js b/src/index.js index bbb0b03..941502b 100644 --- a/src/index.js +++ b/src/index.js @@ -1,5 +1,6 @@ const uuidV4 = require('uuid/v4'); const createScheduler = require('probot-scheduler'); +const getMergedConfig = require('probot-config'); const App = require('./lock'); const schema = require('./schema'); @@ -27,7 +28,7 @@ module.exports = robot => { const configFile = 'lock.yml'; const repo = context.repo(); try { - const repoConfig = await context.config(configFile); + const repoConfig = await getMergedConfig(context, configFile); if (!repoConfig) { logger.warn({repo, configFile}, 'Missing config'); repoConfig = {perform: false}; diff --git a/yarn.lock b/yarn.lock index 51e1448..8a38bb9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2006,6 +2006,13 @@ joi@^13.3.0: isemail "3.x.x" topo "3.x.x" +js-yaml@^3.10.0: + version "3.12.0" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1" + dependencies: + argparse "^1.0.7" + esprima "^4.0.0" + js-yaml@^3.6.1: version "3.11.0" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.11.0.tgz#597c1a8bd57152f26d622ce4117851a51f5ebaef" @@ -3061,6 +3068,12 @@ prepend-http@^1.0.1: version "1.0.4" resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc" +probot-config@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/probot-config/-/probot-config-0.1.0.tgz#b6ef11ccc468e7f28e06deb68b34e093b7c7e88e" + dependencies: + js-yaml "^3.10.0" + probot-scheduler@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/probot-scheduler/-/probot-scheduler-1.1.0.tgz#eda193fd7faaf9a193a8b362903d78741dcda9b7"