Skip to content

Commit

Permalink
feat: extend settings from a different repository
Browse files Browse the repository at this point in the history
  • Loading branch information
dessant committed Jun 19, 2018
1 parent 4abb957 commit 9da62c6
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 1 deletion.
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Expand Down
3 changes: 3 additions & 0 deletions assets/app-description.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ lockComment: >

# pulls:
# daysUntilLock: 30

# Repository to extend settings from
# _extends: repo
```

## Supporting the Project
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
3 changes: 2 additions & 1 deletion src/index.js
Original file line number Diff line number Diff line change
@@ -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');
Expand Down Expand Up @@ -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};
Expand Down
13 changes: 13 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit 9da62c6

Please sign in to comment.