Skip to content

Commit

Permalink
switch to gl-js specific image
Browse files Browse the repository at this point in the history
  • Loading branch information
Molly Lloyd committed Jul 6, 2017
1 parent 8dd7b25 commit 6912d12
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 25 deletions.
5 changes: 2 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,15 @@ 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
- restore_cache:
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:
Expand Down
14 changes: 0 additions & 14 deletions .circleci/dependencies.sh

This file was deleted.

16 changes: 8 additions & 8 deletions .circleci/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@ 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
xvfb-run --server-args="-screen 0 1024x768x24" yarn run test-cov

# send coverage report to coveralls
nyc report --reporter=lcov
Expand All @@ -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

0 comments on commit 6912d12

Please sign in to comment.