From 75f5ce40817377f7693161e73bbad4725bcea2c4 Mon Sep 17 00:00:00 2001
From: Molly Lloyd <molly@mapbox.com>
Date: Thu, 6 Jul 2017 14:39:55 -0700
Subject: [PATCH] switch to gl-js specific image

---
 .circleci/config.yml      |  5 ++---
 .circleci/dependencies.sh | 14 --------------
 .circleci/test.sh         | 14 +++++++-------
 3 files changed, 9 insertions(+), 24 deletions(-)
 delete mode 100755 .circleci/dependencies.sh

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e7426279719..922f8764494 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,7 +3,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: mbgl/ci:r4-linux-clang-3.9
+      - image: mbgl/ci:r1-linux-gl-js
     working_directory: ~/mapbox-gl-js
     steps:
       - checkout
@@ -11,8 +11,7 @@ jobs:
           key: v1-mapbox-gl-js-cache
       - run:
           name: install dependencies
-          command: |
-            bash ./.circleci/dependencies.sh
+          command: yarn
       - save_cache:
           key: v1-mapbox-gl-js-cache
           paths:
diff --git a/.circleci/dependencies.sh b/.circleci/dependencies.sh
deleted file mode 100755
index cdcbd037ef3..00000000000
--- a/.circleci/dependencies.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-# disable spotlight to ensure we waste no CPU on needless file indexing
-if [[ $(uname -s) == 'Darwin' ]]; then sudo mdutil -i off /; fi;
-
-if [[ ! -d ~/.yarn ]]; then
-    curl -o- -L https://yarnpkg.com/install.sh | bash
-fi
-
-PATH="~/.yarn/bin:$PATH"
-
-yarn
-
-if [ "$CIRCLE_BRANCH" == "master" ] || [ -n "$CIRCLE_TAG" ]; then
-    pip install --user --upgrade awscli
-fi
diff --git a/.circleci/test.sh b/.circleci/test.sh
index 7f57f9e80c0..5e4d1164af2 100755
--- a/.circleci/test.sh
+++ b/.circleci/test.sh
@@ -11,16 +11,16 @@ 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
 xvfb-run --server-args="-screen 0 1024x768x24" npm run test-cov
@@ -34,6 +34,6 @@ 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