From 2163e610c84d7e3827cfe97b1fe5e2045ea3d622 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Pierzcha=C5=82a?= <thymikee@gmail.com>
Date: Sun, 27 May 2018 11:20:31 +0200
Subject: [PATCH] Separate lint-and-typecheck from testing on CI (#6304)

---
 .circleci/config.yml | 34 +++++++++++++++++++++++-----------
 .travis.yml          |  2 +-
 CHANGELOG.md         |  3 +--
 package.json         |  2 +-
 4 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index bf1de622999b..2fbf93d2a53e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -18,7 +18,7 @@ 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
@@ -26,13 +26,24 @@ aliases:
       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:
@@ -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
@@ -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
@@ -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:
@@ -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
@@ -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
@@ -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
@@ -115,6 +126,7 @@ workflows:
   version: 2
   build-and-deploy:
     jobs:
+      - lint-and-typecheck
       - test-node-8
       - test-node-6
       - test-node-10
diff --git a/.travis.yml b/.travis.yml
index 1d77d84f3b00..f3f9a030dc32 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 language: node_js
 
 node_js:
-  - "8"
+  - "10"
 
 sudo: false
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 17b8943c304d..60553e25e042 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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
 
diff --git a/package.json b/package.json
index 447c2bce910b..56ada9c9afc5 100644
--- a/package.json
+++ b/package.json
@@ -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",