Skip to content

Commit

Permalink
use google-chrome-unstable for tests
Browse files Browse the repository at this point in the history
switched v4 and v8 to using alpine images
  • Loading branch information
fearphage committed Dec 19, 2017
1 parent 6315621 commit 39186f4
Showing 1 changed file with 15 additions and 7 deletions.
22 changes: 15 additions & 7 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ jobs:
- checkout
- restore_cache:
keys:
- v2-npm-{{ .Branch }}-{{ checksum "package.json" }}
- v2-npm-master-{{ checksum "package.json" }}
- v3-npm-{{ .Branch }}-{{ checksum "package.json" }}
- v3-npm-master-{{ checksum "package.json" }}
- run:
name: Install dependencies
command: |
Expand All @@ -27,27 +27,35 @@ jobs:
else
npm install
fi
# install latest chrome unstable version
if node --version | grep -q '^v6'; then
wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -
echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list
apt-get update
apt-get install -y --no-install-recommends google-chrome-unstable
fi
- run:
name: Pre-Test
# ESLint only supports Node >=4
command: |
if node --version | grep -q '^v6'; then
npm run lint;
npm run test-headless -- --allow-chrome-as-root;
npm run test-webworker -- --allow-chrome-as-root;
npm run test-headless -- --chrome $(which google-chrome-unstable) --allow-chrome-as-root;
npm run test-webworker -- --chrome $(which google-chrome-unstable) --allow-chrome-as-root;
fi
- run:
name: Test
command: npm run test-node
- save_cache:
key: v2-npm-{{ .Branch }}-{{ checksum "package.json" }}
key: v3-npm-{{ .Branch }}-{{ checksum "package.json" }}
paths:
- node_modules

node-4:
<<: *common-build
docker:
- image: node:4
- image: node:4-alpine

node-6:
<<: *common-build
Expand All @@ -57,7 +65,7 @@ jobs:
node-8:
<<: *common-build
docker:
- image: node:8
- image: node:8-alpine
environment:
PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: true

Expand Down

0 comments on commit 39186f4

Please sign in to comment.