From eb4e1ed337d568cf1b47d3de9c24e01ecc35c2f5 Mon Sep 17 00:00:00 2001 From: Kevin van Zonneveld Date: Wed, 6 Apr 2016 17:02:22 +0200 Subject: [PATCH] Remove chrome & zuul now that we're using Firefox for Travis https://docs.travis-ci.com/user/gui-and-headless-browsers/#Using-xvfb-to -Run-Tests-That-Require-a-GUI --- .travis.yml | 1 - .zuul.yml | 8 -------- bin/install-chromedriver | 41 ---------------------------------------- package.json | 2 +- 4 files changed, 1 insertion(+), 51 deletions(-) delete mode 100644 .zuul.yml delete mode 100755 bin/install-chromedriver diff --git a/.travis.yml b/.travis.yml index 0da609de9..c0af1dcb1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,6 @@ cache: - node_modules - website/node_modules before_script: -- export CHROME_BIN=chromium-browser - export PATH=${PATH}:${HOME}/bin - export DISPLAY=:99.0 - /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile diff --git a/.zuul.yml b/.zuul.yml deleted file mode 100644 index 4e3af7f0d..000000000 --- a/.zuul.yml +++ /dev/null @@ -1,8 +0,0 @@ -ui: tape -browsers: - - name: chrome - version: 27..latest - - name: ie - version: latest - - name: iphone - version: 6.1 diff --git a/bin/install-chromedriver b/bin/install-chromedriver deleted file mode 100755 index 0a2bda6f8..000000000 --- a/bin/install-chromedriver +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env bash -set -o pipefail -set -o errexit -set -o nounset -# set -o xtrace - -# Set magic variables for current file & dir -__dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -__file="${__dir}/$(basename "${BASH_SOURCE[0]}")" -__base="$(basename ${__file} .sh)" - -colorRed='\033[0;31m' -colorGreen='\033[0;32m' -colorReset='\033[0m' - -export PATH="${PATH}:${HOME}/bin" - -echo -n "--> Checking for chromedriver: " -if which chromedriver >/dev/null 2>&1; then - echo -e "${colorGreen}✓${colorReset}" -else - echo -e "${colorRed}✗${colorReset}" - echo "--> Installing chromedriver" - if [[ "${OSTYPE}" == "darwin"* ]]; then - brew install chromedriver - else - mkdir -p "${HOME}/bin" - cd "${HOME}/bin" - wget 'http://chromedriver.storage.googleapis.com/2.21/chromedriver_linux64.zip' - unzip -o chromedriver_linux64.zip && rm -f chromedriver_linux64.zip - chmod 755 chromedriver - fi - echo -n "--> Verifying chromedriver: " - if chromedriver -v >/dev/null 2>&1; then - echo -e "${colorGreen}✓${colorReset}" - else - echo -e "${colorRed}✗${colorReset}" - chromedriver -v - exit 1 - fi -fi diff --git a/package.json b/package.json index 95e49f3a1..ed40aada4 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "build": "npm run build:lib && npm run build:bundle && npm run build:bundle:min && npm run build:css", "clean": "rm -rf lib && rm -rf dist", "docs": "cd website && documentation readme ../src/index.js --readme-file=src/api/docs.md --section 'Uppy Core & Plugins' -q --github -c doc-order.json", - "install": "npm run web:install && bin/install-chromedriver", + "install": "npm run web:install", "lint:fix": "eslint . --fix", "lint": "eslint .", "release:major": "env SEMANTIC=major npm run release",