diff --git a/.circleci/config.yml b/.circleci/config.yml index 5a215b58cd12ae..7a6a09aea7ad24 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -34,7 +34,7 @@ commands: command: | node scripts/use-react-dist-tag # log a patch for maintainers who want to check out this change - git diff HEAD + git --no-pager diff HEAD - restore_cache: keys: - v2-yarn-sha-{{ checksum "yarn.lock" }} @@ -152,7 +152,7 @@ jobs: command: | node scripts/use-typescript-dist-tag # log a patch for maintainers who want to check out this change - git diff HEAD + git --no-pager diff HEAD - install_js - run: name: Tests TypeScript definitions diff --git a/scripts/use-react-dist-tag.js b/scripts/use-react-dist-tag.js index e155e4838b102b..02a261738fd00c 100644 --- a/scripts/use-react-dist-tag.js +++ b/scripts/use-react-dist-tag.js @@ -48,7 +48,7 @@ async function main(distTag) { // https://github.com/enzymejs/enzyme/issues/2358 packageJson.devDependencies['enzyme-adapter-react-16'] = 'npm:@eps1lon/enzyme-adapter-react-next'; - // CircleCI seemingly times out if it has a newline diff at the end + // add newline for clean diff fs.writeFileSync(packageJsonPath, `${JSON.stringify(packageJson, null, 2)}${os.EOL}`); } diff --git a/scripts/use-typescript-dist-tag.js b/scripts/use-typescript-dist-tag.js index 8656a31d4d1184..68c63509481a0d 100644 --- a/scripts/use-typescript-dist-tag.js +++ b/scripts/use-typescript-dist-tag.js @@ -44,7 +44,7 @@ async function main(distTag) { packageJson.devDependencies.typescript = version; packageJson.resolutions['**/dtslint/typescript'] = version; - // CircleCI seemingly times out if it has a newline diff at the end + // add newline for clean diff fs.writeFileSync(packageJsonPath, `${JSON.stringify(packageJson, null, 2)}${os.EOL}`); }