Skip to content

Commit

Permalink
fix: disable pager when printing patches
Browse files Browse the repository at this point in the history
  • Loading branch information
eps1lon committed Apr 8, 2020
1 parent dd7b654 commit 5eb89b1
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Expand Up @@ -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" }}
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/use-react-dist-tag.js
Expand Up @@ -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}`);
}

Expand Down
2 changes: 1 addition & 1 deletion scripts/use-typescript-dist-tag.js
Expand Up @@ -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}`);
}

Expand Down

0 comments on commit 5eb89b1

Please sign in to comment.