From 83115e1b7a5c7843a78d0af8f400e9e7214aa845 Mon Sep 17 00:00:00 2001 From: Orta Therox Date: Fri, 15 Dec 2017 18:02:00 -0500 Subject: [PATCH] [Dev] Update to Danger 2.0 Signed-off-by: Orta Therox Signed-off-by: Anandaroop Roy --- .circleci/config.yml | 17 +++-------------- .eslintignore | 2 +- .flowconfig | 2 +- .gitignore | 1 - danger/.babelrc | 1 - danger/README.md | 12 ------------ danger/package.json | 11 ----------- danger/dangerfile.js => dangerfile.js | 4 ++-- package.json | 1 + 9 files changed, 8 insertions(+), 43 deletions(-) delete mode 100644 danger/.babelrc delete mode 100644 danger/README.md delete mode 100644 danger/package.json rename danger/dangerfile.js => dangerfile.js (97%) diff --git a/.circleci/config.yml b/.circleci/config.yml index fb5ff6f62ebb0d..1ee0b044af70c6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,14 +12,13 @@ aliases: - &restore-cache-analysis keys: - - v1-analysis-dependencies-{{ arch }}-{{ .Branch }}-{{ checksum "package.json" }}{{ checksum "danger/package.json" }} + - v1-analysis-dependencies-{{ arch }}-{{ .Branch }}-{{ checksum "package.json" }} # Fallback in case checksum fails - v1-analysis-dependencies-{{ arch }}-{{ .Branch }}- - &save-cache-analysis paths: - - danger/node_modules - node_modules - key: v1-analysis-dependencies-{{ arch }}-{{ .Branch }}-{{ checksum "package.json" }}{{ checksum "danger/package.json" }} + key: v1-analysis-dependencies-{{ arch }}-{{ .Branch }}-{{ checksum "package.json" }} - &restore-cache-android-packages keys: @@ -421,22 +420,12 @@ jobs: - checkout - restore-cache: *restore-cache-analysis - run: *install-node-dependencies - - run: - name: Install Dependencies - command: | - if [ -n "$CIRCLE_PULL_REQUEST" ]; then - npm install github@0.2.4 - cd danger - npm install --no-package-lock --no-spin --no-progress - else - echo "Skipping dependency installation." - fi - save-cache: *save-cache-analysis - run: name: Analyze Pull Request command: | if [ -n "$CIRCLE_PULL_REQUEST" ]; then - cd danger && DANGER_GITHUB_API_TOKEN="e622517d9f1136ea8900""07c6373666312cdfaa69" npm run danger + DANGER_GITHUB_API_TOKEN="e622517d9f1136ea8900""07c6373666312cdfaa69" npm run danger else echo "Skipping pull request analysis." fi diff --git a/.eslintignore b/.eslintignore index 698b5357d68697..e68b53c8cfeeeb 100644 --- a/.eslintignore +++ b/.eslintignore @@ -7,4 +7,4 @@ Libraries/Renderer/* pr-inactivity-bookmarklet.js question-bookmarklet.js flow/ -danger/ + diff --git a/.flowconfig b/.flowconfig index f63fddf53a8f7a..1b16429517e534 100644 --- a/.flowconfig +++ b/.flowconfig @@ -6,7 +6,7 @@ .*/local-cli/templates/.* ; Ignore the Dangerfile -/danger/dangerfile.js +/dangerfile.js ; Ignore "BUCK" generated dirs /\.buckd/ diff --git a/.gitignore b/.gitignore index 15a2a9668a1a9f..8a860f1ed8e299 100644 --- a/.gitignore +++ b/.gitignore @@ -47,7 +47,6 @@ local.properties node_modules *.log .nvm -/danger/node_modules/ # OS X .DS_Store diff --git a/danger/.babelrc b/danger/.babelrc deleted file mode 100644 index 0967ef424bce67..00000000000000 --- a/danger/.babelrc +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/danger/README.md b/danger/README.md deleted file mode 100644 index 154140cb75c74b..00000000000000 --- a/danger/README.md +++ /dev/null @@ -1,12 +0,0 @@ -If you'd like to make changes to the Dangerfile, find an existing PR and copy the URL. - -Then run from the React Native root: - -``` -cd danger -npm install -.. -node danger/node_modules/.bin/danger pr https://github.com/facebook/react-native/pull/1 -``` - -And you will get the responses from parsing the Dangerfile. diff --git a/danger/package.json b/danger/package.json deleted file mode 100644 index 2b9ec69565dac7..00000000000000 --- a/danger/package.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "private": true, - "scripts": { - "danger": "node ./node_modules/.bin/danger" - }, - "devDependencies": { - "danger": "^1.2.0", - "lodash.includes": "^4.3.0", - "minimatch": "^3.0.4" - } -} diff --git a/danger/dangerfile.js b/dangerfile.js similarity index 97% rename from danger/dangerfile.js rename to dangerfile.js index d38ccdd6b4db74..00ac16c4a78fcf 100644 --- a/danger/dangerfile.js +++ b/dangerfile.js @@ -124,7 +124,7 @@ if (!includesReleaseNotes) { // Tags PRs that have been submitted by a core contributor. // TODO: Switch to using an actual MAINTAINERS file. -const taskforce = fs.readFileSync('../bots/IssueCommands.txt', 'utf8').split('\n')[0].split(':')[1]; +const taskforce = fs.readFileSync('bots/IssueCommands.txt', 'utf8').split('\n')[0].split(':')[1]; const isSubmittedByTaskforce = includes(taskforce, danger.github.pr.user.login); if (isSubmittedByTaskforce) { markdown('@facebook-github-bot label Core Team'); @@ -171,7 +171,7 @@ if (!isMergeRefMaster && isMergeRefStable) { } // People can add themselves to CODEOWNERS in order to be automatically added as reviewers when a file matching a glob pattern is modified. The following will have the bot add a mention in that case. -const codeowners = fs.readFileSync('../.github/CODEOWNERS', 'utf8').split('\n'); +const codeowners = fs.readFileSync('.github/CODEOWNERS', 'utf8').split('\n'); let mentions = []; codeowners.forEach((codeowner) => { const pattern = codeowner.split(' ')[0]; diff --git a/package.json b/package.json index 391b110b45d20a..5c17489b19933a 100644 --- a/package.json +++ b/package.json @@ -200,6 +200,7 @@ }, "devDependencies": { "babel-eslint": "^7.2.3", + "danger": "^2.1.5", "eslint": "^3.19.0", "eslint-config-fb-strict": "^20.0.3", "eslint-config-fbjs": "^1.1.1",