Skip to content

Commit

Permalink
Separate lint-and-typecheck from testing on CI (#6304)
Browse files Browse the repository at this point in the history
  • Loading branch information
thymikee committed May 27, 2018
1 parent f527647 commit 2163e61
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 15 deletions.
34 changes: 23 additions & 11 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,32 @@ aliases:
git config --global user.name "Website Deployment Script"
echo "machine github.com login docusaurus-bot password $DOCUSAURUS_PUBLISH_TOKEN" > ~/.netrc
# install Docusaurus and generate file of English strings
yarn && cd website && yarn run write-translations
yarn && cd website && yarn write-translations
# crowdin install
sudo apt-get update
sudo apt-get install default-jre rsync
wget https://artifacts.crowdin.com/repo/deb/crowdin.deb -O crowdin.deb
sudo dpkg -i crowdin.deb
sleep 5
# translations upload/download
yarn run crowdin-upload
yarn run crowdin-download
yarn crowdin-upload
yarn crowdin-download
# build and publish website
GIT_USER=docusaurus-bot USE_SSH=false yarn run publish-gh-pages
GIT_USER=docusaurus-bot USE_SSH=false yarn publish-gh-pages
version: 2
jobs:
lint-and-typecheck:
working_directory: ~/jest
docker:
- image: circleci/node:10
steps:
- checkout
- restore-cache: *restore-cache
- run: yarn --no-progress
- save-cache: *save-cache
- run: yarn lint && yarn typecheck && yarn lint-es5-build && yarn lint:md:ci

test-browser:
working_directory: ~/jest
docker:
Expand All @@ -42,7 +53,7 @@ jobs:
- restore-cache: *restore-cache
- run: yarn --no-progress
- save-cache: *save-cache
- run: yarn run test-ci-es5-build-in-browser
- run: yarn test-ci-es5-build-in-browser

test-node-10:
working_directory: ~/jest
Expand All @@ -53,7 +64,7 @@ jobs:
- restore-cache: *restore-cache
- run: yarn --no-progress
- save-cache: *save-cache
- run: yarn run test-ci-partial
- run: yarn test-ci-partial

test-node-9:
working_directory: ~/jest
Expand All @@ -64,8 +75,8 @@ jobs:
- restore-cache: *restore-cache
- run: yarn --no-progress
- save-cache: *save-cache
- run: yarn run test-ci-partial
- run: yarn test-ci-partial

test-jest-circus:
working_directory: ~/jest
docker:
Expand All @@ -75,7 +86,7 @@ jobs:
- restore-cache: *restore-cache
- run: yarn --no-progress
- save-cache: *save-cache
- run: JEST_CIRCUS=1 yarn run test-ci-partial
- run: JEST_CIRCUS=1 yarn test-ci-partial

test-node-8:
working_directory: ~/jest
Expand All @@ -86,7 +97,7 @@ jobs:
- restore-cache: *restore-cache
- run: yarn --no-progress
- save-cache: *save-cache
- run: yarn run test-ci
- run: yarn test-ci

test-node-6:
working_directory: ~/jest
Expand All @@ -97,7 +108,7 @@ jobs:
- restore-cache: *restore-cache
- run: yarn --no-progress
- save-cache: *save-cache
- run: yarn run test-ci-partial
- run: yarn test-ci-partial

test-and-deploy-website:
working_directory: ~/jest
Expand All @@ -115,6 +126,7 @@ workflows:
version: 2
build-and-deploy:
jobs:
- lint-and-typecheck
- test-node-8
- test-node-6
- test-node-10
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: node_js

node_js:
- "8"
- "10"

sudo: false

Expand Down
3 changes: 1 addition & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@

### Fixes

* `[pretty-format]` Serialize inverse asymmetric matchers correctly
([#6272](https://github.com/facebook/jest/pull/6272))
* `[pretty-format]` Serialize inverse asymmetric matchers correctly ([#6272](https://github.com/facebook/jest/pull/6272))

## 23.0.0

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
"postinstall": "yarn build",
"publish": "yarn build-clean && yarn build && lerna publish --silent",
"test-ci-es5-build-in-browser": "karma start --single-run",
"test-ci": "yarn typecheck && yarn lint && yarn lint-es5-build && yarn lint:md:ci && yarn jest-coverage -i --reporters jest-silent-reporter && yarn test-leak && node scripts/mapCoverage.js && codecov",
"test-ci": "yarn jest-coverage -i --reporters jest-silent-reporter && yarn test-leak && node scripts/mapCoverage.js && codecov",
"test-ci-partial": "yarn jest -i --reporters jest-silent-reporter",
"test-pretty-format-perf": "node packages/pretty-format/perf/test.js",
"test-leak": "yarn jest -i --detectLeaks jest-mock jest-diff jest-repl",
Expand Down

0 comments on commit 2163e61

Please sign in to comment.