From 39186f4276c5b47d9e616c4d1e65d3d2948f70ec Mon Sep 17 00:00:00 2001 From: Phred Date: Tue, 19 Dec 2017 11:45:38 -0600 Subject: [PATCH] use google-chrome-unstable for tests switched v4 and v8 to using alpine images --- .circleci/config.yml | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 312d10274..d8999a521 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -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: | @@ -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 @@ -57,7 +65,7 @@ jobs: node-8: <<: *common-build docker: - - image: node:8 + - image: node:8-alpine environment: PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: true