migrate to ci 2.0

.circleci/config.yml

@@ -0,0 +1,76 @@
+version: 2
+
+workflows:
+  version: 2
+  default:
+    jobs:
+      - build:
+          filters:
+            tags:
+              ignore: /v[0-9]+.[0-9]+.[0-9]+(-dev)?/
+      - build-and-release:
+          filters:
+            tags:
+              only: /v[0-9]+.[0-9]+.[0-9]+(-dev)?/
+            branches:
+              ignore: /.*/
+
+
+jobs:
+  build:
+    docker:
+      - image: mbgl/ci:r4-linux-gl-js
+    working_directory: ~/mapbox-gl-js
+    resource_class: large
+    steps:
+      - checkout
+      - restore_cache:
+          key: v1-mapbox-gl-js-cache
+      - run:
+          name: install dependencies
+          command: yarn
+      - save_cache:
+          key: v1-mapbox-gl-js-cache
+          paths:
+            - '~/.yarn'
+            - '.eslintcache'
+            - 'node_modules'
+      - run:
+          name: run tests
+          command: |
+            bash ./.circleci/test.sh
+      - store_artifacts:
+          path: "test/integration/render-tests/index.html"
+      - store_artifacts:
+          path: "test/integration/query-tests/index.html"
+  build-and-release:
+    docker:
+      - image: mbgl/ci:r4-linux-gl-js
+    working_directory: ~/mapbox-gl-js
+    resource_class: large
+    steps:
+      - checkout
+      - restore_cache:
+          key: v1-mapbox-gl-js-cache
+      - run:
+          name: install dependencies
+          command: yarn
+      - save_cache:
+          key: v1-mapbox-gl-js-cache
+          paths:
+            - '~/.yarn'
+            - '.eslintcache'
+            - 'node_modules'
+      - run:
+          name: run tests
+          command: |
+            bash ./.circleci/test.sh
+      - store_artifacts:
+          path: "test/integration/render-tests/index.html"
+      - store_artifacts:
+          path: "test/integration/query-tests/index.html"
+      - run:
+          name: deploy
+          when: on_success
+          command: bash ./.circleci/deploy.sh
+

ci-scripts/test.sh → .circleci/test.sh

@@ -1,8 +1,3 @@
-#!/usr/bin/env bash
-
-source ./nvm/nvm.sh
-nvm use ${NODE_VERSION}
-
 set -e
 set -o pipefail
 
@@ -18,29 +13,30 @@ PATH=$(python -m site --user-base)/bin:${PATH}
 rm -rf coverage .nyc_output
 
 # run linters
-npm run lint
-npm run lint-docs
-npm run lint-css
+yarn run lint
+yarn run lint-docs
+yarn run lint-css
 
 # build and run build tests
-npm run build-min
-npm run build-dev
+yarn run build-min
+yarn run build-dev
 
 # run flow to check types
-npm run test-flow
+yarn run test-flow
 
 # run unit, render & query tests with coverage
-npm run test-cov
+xvfb-run --server-args="-screen 0 1024x768x24" npm run test-cov
 
 # send coverage report to coveralls
 nyc report --reporter=lcov
+
 # this code works around a Coveralls / CircleCI bug triggered by tagged builds
 if [ -z "$CIRCLE_TAG" ]; then
     (node ./node_modules/coveralls/bin/coveralls.js < ./coverage/lcov.info) || true
 fi
 
 # upload benchmarks
 if [ "$CIRCLE_BRANCH" == "master" ]; then
-    npm run build-benchmarks
+    yarn run build-benchmarks
     aws s3 cp --acl public-read --content-type application/javascript bench/benchmarks_generated.js s3://mapbox-gl-js/master/benchmarks.js
 fi

test/integration/render-tests/debug/collision-pitched-wrapped/style.json

@@ -4,7 +4,8 @@
     "test": {
       "collisionDebug": true,
       "width": 500,
-      "height": 500
+      "height": 500,
+      "diff": 0.005
     }
   },
   "center": [

test/integration/render-tests/debug/collision-pitched/style.json

@@ -4,7 +4,8 @@
     "test": {
       "collisionDebug": true,
       "width": 500,
-      "height": 500
+      "height": 500,
+      "diff": 0.005
     }
   },
   "center": [