Skip to content

Commit

Permalink
Revert "fix: no idea why circleci times out"
Browse files Browse the repository at this point in the history
This reverts commit c281c23.
  • Loading branch information
eps1lon committed Apr 8, 2020
1 parent c281c23 commit dd7b654
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
2 changes: 0 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ 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" }}
Expand Down Expand Up @@ -154,7 +153,6 @@ 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
Expand Down
3 changes: 2 additions & 1 deletion scripts/use-react-dist-tag.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
*/
const childProcess = require('child_process');
const fs = require('fs');
const os = require('os');
const path = require('path');
const { promisify } = require('util');

Expand Down Expand Up @@ -48,7 +49,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));
fs.writeFileSync(packageJsonPath, `${JSON.stringify(packageJson, null, 2)}${os.EOL}`);
}

main(process.env.REACT_DIST_TAG).catch((error) => {
Expand Down
4 changes: 3 additions & 1 deletion scripts/use-typescript-dist-tag.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
*/
const childProcess = require('child_process');
const fs = require('fs');
const os = require('os');
const path = require('path');
const { promisify } = require('util');

Expand Down Expand Up @@ -43,7 +44,8 @@ async function main(distTag) {
packageJson.devDependencies.typescript = version;
packageJson.resolutions['**/dtslint/typescript'] = version;

fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2));
// CircleCI seemingly times out if it has a newline diff at the end
fs.writeFileSync(packageJsonPath, `${JSON.stringify(packageJson, null, 2)}${os.EOL}`);
}

main(process.env.TYPESCRIPT_DIST_TAG).catch((error) => {
Expand Down

0 comments on commit dd7b654

Please sign in to comment.