From c281c2396c8afe998ea3d5a7791ceed6bd730452 Mon Sep 17 00:00:00 2001 From: Sebastian Silbermann Date: Wed, 8 Apr 2020 23:14:59 +0200 Subject: [PATCH] fix: no idea why circleci times out --- .circleci/config.yml | 2 ++ scripts/use-react-dist-tag.js | 3 +-- scripts/use-typescript-dist-tag.js | 4 +--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5a215b58cd12ae..d21255adb80b21 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -35,6 +35,7 @@ commands: node scripts/use-react-dist-tag # log a patch for maintainers who want to check out this change git diff HEAD + exit 0 - restore_cache: keys: - v2-yarn-sha-{{ checksum "yarn.lock" }} @@ -153,6 +154,7 @@ jobs: node scripts/use-typescript-dist-tag # log a patch for maintainers who want to check out this change git diff HEAD + exit 0 - 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..c20e7eda433911 100644 --- a/scripts/use-react-dist-tag.js +++ b/scripts/use-react-dist-tag.js @@ -9,7 +9,6 @@ */ const childProcess = require('child_process'); const fs = require('fs'); -const os = require('os'); const path = require('path'); const { promisify } = require('util'); @@ -49,7 +48,7 @@ async function main(distTag) { 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 - fs.writeFileSync(packageJsonPath, `${JSON.stringify(packageJson, null, 2)}${os.EOL}`); + fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2)); } main(process.env.REACT_DIST_TAG).catch((error) => { diff --git a/scripts/use-typescript-dist-tag.js b/scripts/use-typescript-dist-tag.js index 8656a31d4d1184..e5747c01589f96 100644 --- a/scripts/use-typescript-dist-tag.js +++ b/scripts/use-typescript-dist-tag.js @@ -11,7 +11,6 @@ */ const childProcess = require('child_process'); const fs = require('fs'); -const os = require('os'); const path = require('path'); const { promisify } = require('util'); @@ -44,8 +43,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 - fs.writeFileSync(packageJsonPath, `${JSON.stringify(packageJson, null, 2)}${os.EOL}`); + fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2)); } main(process.env.TYPESCRIPT_DIST_TAG).catch((error) => {