diff --git a/.npmignore b/.npmignore index 1df03005..19dfbfbb 100644 --- a/.npmignore +++ b/.npmignore @@ -19,3 +19,4 @@ scripts/ test/ appveyor.yml webpack.config*.js +renovate.json diff --git a/.travis.yml b/.travis.yml index 2acd7817..9f2b2ebf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,16 +15,9 @@ matrix: cache: yarn -before_install: - - yarn global add greenkeeper-lockfile@1 - before_script: - - greenkeeper-lockfile-update - NODE_ENV=$BUILD_ENV yarn build -after_script: - - greenkeeper-lockfile-upload - notifications: email: on_success: never diff --git a/renovate.json b/renovate.json index f45d8f11..44b8c89c 100644 --- a/renovate.json +++ b/renovate.json @@ -1,5 +1,12 @@ { "extends": [ "config:base" - ] + ], + "ignorePaths": [ + "test/" + ], + "labels": [ + "Type: Dependencies" + ], + "statusCheckVerify": true } diff --git a/scripts/changelog.js b/scripts/changelog.js index 81dc6bcc..29e0b3e1 100644 --- a/scripts/changelog.js +++ b/scripts/changelog.js @@ -126,7 +126,7 @@ For more details, [see the full changelog](${items.fullChangelogUrl}) and [miles ### Changed ${_.isEmpty(items.dependencies) ? "" : - `- Update production dependencies to their latest versions, by [Greenkeeper](https://greenkeeper.io/) 🚀: + `- Update production dependencies to their latest versions: ${printDependencyList(items.dependencies)}` } @@ -160,7 +160,7 @@ ${printList(items.websiteDocumentation)}` ${printList(items.internals)}${ _.isEmpty(items.devDependencies) ? "" : ` -- Update development dependencies to their latest versions, by [Greenkeeper](https://greenkeeper.io/) 🚀: +- Update development dependencies to their latest versions: ${printDependencyList(items.devDependencies)}`} @@@@@@@@@@@@@@@@@@@ @@ -516,10 +516,9 @@ function isSkipped(entry) { return hasLabelOrAnnotatedComment(entry, "Meta: Skip Changelog"); } -// Greenkeeper PRs are listed in a special, more concise way in the changelog. -// Returns true if the PR was open by Greenkeeper, false otherwise. -function isDependency({author, labels}) { - return hasLabel(labels, "greenkeeper") || author.login === "greenkeeper"; +// Dependency update PRs are listed in a special, more concise way in the changelog. +function isDependency({labels}) { + return hasLabel(labels, "Type: Dependencies"); } function isDocumentation({labels}) { @@ -617,7 +616,7 @@ function parse(entries) { // (with format `@username`) of everyone who contributed to this version. function extractContributors(entries) { const set = Object.values(entries).reduce((memo, pullRequest) => { - if (pullRequest.author.login !== "greenkeeper") { + if (pullRequest.author.login !== "greenkeeper" && pullRequest.author.login !== "renovate-bot") { memo.add("@" + pullRequest.author.login); }