Merge branch 'master' into node-fetch-extensions

apollographql · Sep 2, 2018 · e9adc90 · e9adc90
2 parents b4b0f5e + 66ff449
commit e9adc90
Show file tree

Hide file tree

Showing 7 changed files with 2,526 additions and 2,538 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -39,7 +39,7 @@ common_test_steps: &common_test_steps
           # This should cache the npm cache instead of node_modules, which is needed because
           # npm ci actually removes node_modules before installing to guarantee a clean slate.
           - ~/.npm
-    - run: npm run circle
+    - run: npm run test:ci
 
 # Important! When adding a new job to `jobs`, make sure to define when it
 # executes by also adding it to the `workflows` section below!