Merge pull request webpack#3875 from webpack/test/circleci

sokra · web-flow · commit 34315db3ffe2 · 2017-04-23T14:25:42.000+02:00
Update circle.yml
diff --git a/circle.yml b/circle.yml
@@ -1,27 +1,23 @@
-general:
-  artifacts:
-    - "./coverage"
+machine:
+  environment:
+    NO_WATCH_TESTS: 1
 
 machine:
-  node:
-    version: 4.7.0
+  environment:
+    PATH: "${PATH}:${HOME}/${CIRCLE_PROJECT_REPONAME}/node_modules/.bin"
 
 dependencies:
   pre:
-    - npm install -g yarn
+    - case $CIRCLE_NODE_INDEX in 0) NODE_VERSION=4 ;; 1) NODE_VERSION=7 ;; esac; nvm install $NODE_VERSION && nvm alias default $NODE_VERSION
   override:
-    - yarn install
-  post:
+    - yarn
     - yarn link || true && yarn link webpack
+  cache_directories:
+    - ~/.cache/yarn
 
 test:
-  pre:
-    - npm run travis:lint
   override:
-    - npm run travis:test:
-        parallel: true
-        files:
-          - test/ConfigTestCases.test.js
-          - test/TestCases.test.js
-          - test/Stats.test.js
-          - test/**/*.test.js
+    - node -v
+    - yarn --version
+    - yarn run circleci:lint
+    - yarn run circleci:test
diff --git a/package.json b/package.json
@@ -94,6 +94,8 @@
     "travis:benchmark": "npm run benchmark",
     "appveyor:test": "node --max_old_space_size=4096 node_modules\\mocha\\bin\\mocha --harmony test/*.test.js",
     "appveyor:benchmark": "npm run benchmark",
+    "circleci:test": "node --max_old_space_size=4096 node_modules/mocha/bin/mocha --harmony test/*.test.js",
+    "circleci:lint": "npm run lint-files && npm run nsp",
     "build:examples": "cd examples && node buildAll.js",
     "pretest": "npm run lint-files",
     "lint-files": "npm run lint && npm run beautify-lint",
