diff --git a/.travis.yml b/.travis.yml index a8a8bde20..52c357b5f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,10 +54,11 @@ matrix: - echo "Validating that danger pr works as expected" - DEBUG="*" danger pr https://github.com/danger/danger-js/pull/465 --dangerfile dangerfile.circle.js --verbose - - echo "Validating that danger local works as expected" - - git fetch origin master - - git diff master...HEAD - - DEBUG="*" danger local --dangerfile source/platforms/git/_tests/local_dangerfile_example.ts + - echo "Grabbing master so that danger-local can use it for comparison" + - git checkout -t origin/master || true + - '[ ! -z $TRAVIS_PULL_REQUEST ] && DEBUG="*" danger local --dangerfile source/platforms/git/_tests/local_dangerfile_example.ts || echo "Skipping Danger Local for non PR run"' + + # Create some fake projects at runtime - node_js: '7' diff --git a/CHANGELOG.md b/CHANGELOG.md index 99dc77877..aa93674b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,8 @@ ## Master +* Fixes a crash if lodash isn't a transitive dependency in your node_modules - [@orta][] + # 3.7.20 * Logging / verification improvements for the subprocess - [@orta][] diff --git a/source/platforms/git/diffToGitJSONDSL.ts b/source/platforms/git/diffToGitJSONDSL.ts index 4fb05f590..e4adbf453 100644 --- a/source/platforms/git/diffToGitJSONDSL.ts +++ b/source/platforms/git/diffToGitJSONDSL.ts @@ -1,5 +1,5 @@ import * as parseDiff from "parse-diff" -import { includes } from "lodash" +import * as includes from "lodash.includes" import { GitCommit } from "../../dsl/Commit" import { GitJSONDSL } from "../../dsl/GitDSL"